Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / plugin / plugin_thread.cc

diff --git a/src/content/plugin/plugin_thread.cc b/src/content/plugin/plugin_thread.cc
index bec0f98..e51e39b 100644 (file)
--- a/src/content/plugin/plugin_thread.cc
+++ b/src/content/plugin/plugin_thread.cc
@@ -39,10 +39,10 @@ class EnsureTerminateMessageFilter : public IPC::MessageFilter {
   EnsureTerminateMessageFilter() {}
 
  protected:
-  virtual ~EnsureTerminateMessageFilter() {}
+  ~EnsureTerminateMessageFilter() override {}
 
   // IPC::MessageFilter:
-  virtual void OnChannelError() OVERRIDE {
+  void OnChannelError() override {
     // How long we wait before forcibly shutting down the process.
     const base::TimeDelta kPluginProcessTerminateTimeout =
         base::TimeDelta::FromSeconds(3);
@@ -93,9 +93,9 @@ PluginThread::PluginThread()
 
   channel()->AddFilter(new EnsureTerminateMessageFilter());
 
-  // This is needed because we call some code which uses WebKit strings.
-  webkit_platform_support_.reset(new BlinkPlatformImpl);
-  blink::initialize(webkit_platform_support_.get());
+  // This is needed because we call some code which uses Blink strings.
+  blink_platform_impl_.reset(new BlinkPlatformImpl);
+  blink::initialize(blink_platform_impl_.get());
 }
 
 PluginThread::~PluginThread() {
@@ -146,7 +146,7 @@ void PluginThread::OnCreateChannel(int renderer_id,
 #if defined(OS_POSIX)
     // On POSIX, pass the renderer-side FD.
     channel_handle.socket =
-        base::FileDescriptor(channel->TakeRendererFileDescriptor(), true);
+        base::FileDescriptor(channel->TakeRendererFileDescriptor());
 #endif
     channel->set_incognito(incognito);
   }