Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / ppapi_plugin_process_host.cc

diff --git a/src/content/browser/ppapi_plugin_process_host.cc b/src/content/browser/ppapi_plugin_process_host.cc
index 49d3017..22b69ba 100644 (file)
--- a/src/content/browser/ppapi_plugin_process_host.cc
+++ b/src/content/browser/ppapi_plugin_process_host.cc
@@ -48,10 +48,10 @@ class PpapiPluginSandboxedProcessLauncherDelegate
 #endif  // OS_POSIX
         is_broker_(is_broker) {}
 
-  virtual ~PpapiPluginSandboxedProcessLauncherDelegate() {}
+  ~PpapiPluginSandboxedProcessLauncherDelegate() override {}
 
 #if defined(OS_WIN)
-  virtual bool ShouldSandbox() OVERRIDE {
+  virtual bool ShouldSandbox() override {
     return !is_broker_;
   }
 
@@ -69,22 +69,20 @@ class PpapiPluginSandboxedProcessLauncherDelegate
   }
 
 #elif defined(OS_POSIX)
-  virtual bool ShouldUseZygote() OVERRIDE {
+  bool ShouldUseZygote() override {
     const base::CommandLine& browser_command_line =
         *base::CommandLine::ForCurrentProcess();
     base::CommandLine::StringType plugin_launcher = browser_command_line
         .GetSwitchValueNative(switches::kPpapiPluginLauncher);
     return !is_broker_ && plugin_launcher.empty() && info_.is_sandboxed;
   }
-  virtual int GetIpcFd() OVERRIDE {
-    return ipc_fd_;
-  }
+  base::ScopedFD TakeIpcFd() override { return ipc_fd_.Pass(); }
 #endif  // OS_WIN
 
  private:
 #if defined(OS_POSIX)
   const PepperPluginInfo& info_;
-  int ipc_fd_;
+  base::ScopedFD ipc_fd_;
 #endif  // OS_POSIX
   bool is_broker_;
 
@@ -101,13 +99,13 @@ class PpapiPluginProcessHost::PluginNetworkObserver
     net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   }
 
-  virtual ~PluginNetworkObserver() {
+  ~PluginNetworkObserver() override {
     net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
     net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
   }
 
   // IPAddressObserver implementation.
-  virtual void OnIPAddressChanged() OVERRIDE {
+  void OnIPAddressChanged() override {
     // TODO(brettw) bug 90246: This doesn't seem correct. The online/offline
     // notification seems like it should be sufficient, but I don't see that
     // when I unplug and replug my network cable. Sending this notification when
@@ -118,8 +116,8 @@ class PpapiPluginProcessHost::PluginNetworkObserver
   }
 
   // ConnectionTypeObserver implementation.
-  virtual void OnConnectionTypeChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
+  void OnConnectionTypeChanged(
+      net::NetworkChangeNotifier::ConnectionType type) override {
     process_host_->Send(new PpapiMsg_SetNetworkState(
         type != net::NetworkChangeNotifier::CONNECTION_NONE));
   }