BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1

Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

19 files changed, 95 insertions, 79 deletions

diff --git a/chromium/components/guest_view/browser/guest_view_base.cc b/chromium/components/guest_view/browser/guest_view_base.cc
index d4209695bcc..3334745172f 100644
--- a/chromium/components/guest_view/browser/guest_view_base.cc
+++ b/chromium/components/guest_view/browser/guest_view_base.cc
@@ -8,6 +8,7 @@
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/guest_view/browser/guest_view_event.h"
 #include "components/guest_view/browser/guest_view_manager.h"
@@ -195,7 +196,7 @@ void GuestViewBase::Init(const base::DictionaryValue& create_params,
     return;
   }
 
-  scoped_ptr<base::DictionaryValue> params(create_params.DeepCopy());
+  std::unique_ptr<base::DictionaryValue> params(create_params.DeepCopy());
   CreateWebContents(create_params,
                     base::Bind(&GuestViewBase::CompleteInit,
                                weak_ptr_factory_.GetWeakPtr(),
@@ -261,13 +262,13 @@ void GuestViewBase::DispatchOnResizeEvent(const gfx::Size& old_size,
     return;
 
   // Dispatch the onResize event.
-  scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
+  std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   args->SetInteger(kOldWidth, old_size.width());
   args->SetInteger(kOldHeight, old_size.height());
   args->SetInteger(kNewWidth, new_size.width());
   args->SetInteger(kNewHeight, new_size.height());
   DispatchEventToGuestProxy(
-      make_scoped_ptr(new GuestViewEvent(kEventResize, std::move(args))));
+      base::WrapUnique(new GuestViewEvent(kEventResize, std::move(args))));
 }
 
 gfx::Size GuestViewBase::GetDefaultSize() const {
@@ -747,11 +748,11 @@ void GuestViewBase::OnZoomChanged(
 }
 
 void GuestViewBase::DispatchEventToGuestProxy(
-    scoped_ptr<GuestViewEvent> event) {
+    std::unique_ptr<GuestViewEvent> event) {
   event->Dispatch(this, guest_instance_id_);
 }
 
-void GuestViewBase::DispatchEventToView(scoped_ptr<GuestViewEvent> event) {
+void GuestViewBase::DispatchEventToView(std::unique_ptr<GuestViewEvent> event) {
   if (!attached() &&
       (!CanRunInDetachedState() || !can_owner_receive_events())) {
     pending_events_.push_back(std::move(event));
@@ -765,14 +766,15 @@ void GuestViewBase::SendQueuedEvents() {
   if (!attached())
     return;
   while (!pending_events_.empty()) {
-    scoped_ptr<GuestViewEvent> event_ptr = std::move(pending_events_.front());
+    std::unique_ptr<GuestViewEvent> event_ptr =
+        std::move(pending_events_.front());
     pending_events_.pop_front();
     event_ptr->Dispatch(this, view_instance_id_);
   }
 }
 
 void GuestViewBase::CompleteInit(
-    scoped_ptr<base::DictionaryValue> create_params,
+    std::unique_ptr<base::DictionaryValue> create_params,
     const WebContentsCreatedCallback& callback,
     WebContents* guest_web_contents) {
   if (!guest_web_contents) {
diff --git a/chromium/components/guest_view/browser/guest_view_base.h b/chromium/components/guest_view/browser/guest_view_base.h
index 745dd7a6a2b..8f216853bb9 100644
--- a/chromium/components/guest_view/browser/guest_view_base.h
+++ b/chromium/components/guest_view/browser/guest_view_base.h
@@ -5,10 +5,10 @@
 #ifndef COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_
 #define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_BASE_H_
 
+#include <memory>
 #include <queue>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "components/guest_view/common/guest_view_constants.h"
@@ -36,10 +36,10 @@ struct SetSizeParams {
   SetSizeParams();
   ~SetSizeParams();
 
-  scoped_ptr<bool> enable_auto_size;
-  scoped_ptr<gfx::Size> min_size;
-  scoped_ptr<gfx::Size> max_size;
-  scoped_ptr<gfx::Size> normal_size;
+  std::unique_ptr<bool> enable_auto_size;
+  std::unique_ptr<gfx::Size> min_size;
+  std::unique_ptr<gfx::Size> max_size;
+  std::unique_ptr<gfx::Size> normal_size;
 };
 
 // A GuestViewBase is the base class browser-side API implementation for a
@@ -113,10 +113,10 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
   virtual int GetTaskPrefix() const = 0;
 
   // Dispatches an event to the guest proxy.
-  void DispatchEventToGuestProxy(scoped_ptr<GuestViewEvent> event);
+  void DispatchEventToGuestProxy(std::unique_ptr<GuestViewEvent> event);
 
   // Dispatches an event to the view.
-  void DispatchEventToView(scoped_ptr<GuestViewEvent> event);
+  void DispatchEventToView(std::unique_ptr<GuestViewEvent> event);
 
   // This creates a WebContents and initializes |this| GuestViewBase to use the
   // newly created WebContents.
@@ -383,7 +383,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
 
   void SendQueuedEvents();
 
-  void CompleteInit(scoped_ptr<base::DictionaryValue> create_params,
+  void CompleteInit(std::unique_ptr<base::DictionaryValue> create_params,
                     const WebContentsCreatedCallback& callback,
                     content::WebContents* guest_web_contents);
 
@@ -432,7 +432,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
 
   // This is a queue of Events that are destined to be sent to the embedder once
   // the guest is attached to a particular embedder.
-  std::deque<scoped_ptr<GuestViewEvent>> pending_events_;
+  std::deque<std::unique_ptr<GuestViewEvent>> pending_events_;
 
   // The opener guest view.
   base::WeakPtr<GuestViewBase> opener_;
@@ -441,15 +441,15 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
   // are passed in from JavaScript. This will typically be the view instance ID,
   // and element-specific parameters. These parameters are passed along to new
   // guests that are created from this guest.
-  scoped_ptr<base::DictionaryValue> attach_params_;
+  std::unique_ptr<base::DictionaryValue> attach_params_;
 
   // This observer ensures that this guest self-destructs if the embedder goes
   // away.
-  scoped_ptr<OwnerContentsObserver> owner_contents_observer_;
+  std::unique_ptr<OwnerContentsObserver> owner_contents_observer_;
 
   // This observer ensures that if the guest is unattached and its opener goes
   // away then this guest also self-destructs.
-  scoped_ptr<OpenerLifetimeObserver> opener_lifetime_observer_;
+  std::unique_ptr<OpenerLifetimeObserver> opener_lifetime_observer_;
 
   // The size of the guest content. Note: In autosize mode, the container
   // element may not match the size of the guest.
diff --git a/chromium/components/guest_view/browser/guest_view_event.cc b/chromium/components/guest_view/browser/guest_view_event.cc
index 883b8b7f771..472642c85e7 100644
--- a/chromium/components/guest_view/browser/guest_view_event.cc
+++ b/chromium/components/guest_view/browser/guest_view_event.cc
@@ -13,7 +13,7 @@
 namespace guest_view {
 
 GuestViewEvent::GuestViewEvent(const std::string& name,
-                               scoped_ptr<base::DictionaryValue> args)
+                               std::unique_ptr<base::DictionaryValue> args)
     : name_(name), args_(std::move(args)) {}
 
 GuestViewEvent::~GuestViewEvent() {
diff --git a/chromium/components/guest_view/browser/guest_view_event.h b/chromium/components/guest_view/browser/guest_view_event.h
index 8a4d63793c3..07789a3b02a 100644
--- a/chromium/components/guest_view/browser/guest_view_event.h
+++ b/chromium/components/guest_view/browser/guest_view_event.h
@@ -5,10 +5,10 @@
 #ifndef COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_EVENT_H_
 #define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_EVENT_H_
 
+#include <memory>
 #include <string>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 namespace guest_view {
@@ -22,7 +22,7 @@ class GuestViewBase;
 class GuestViewEvent {
  public:
   GuestViewEvent(const std::string& name,
-                 scoped_ptr<base::DictionaryValue> args);
+                 std::unique_ptr<base::DictionaryValue> args);
   ~GuestViewEvent();
 
   // This method will dispatch the event to the specified |guest|'s embedder and
@@ -31,7 +31,7 @@ class GuestViewEvent {
 
 private:
   const std::string name_;
-  scoped_ptr<base::DictionaryValue> args_;
+  std::unique_ptr<base::DictionaryValue> args_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewEvent);
 };
diff --git a/chromium/components/guest_view/browser/guest_view_manager.cc b/chromium/components/guest_view/browser/guest_view_manager.cc
index 73593921052..7f0d6841b9a 100644
--- a/chromium/components/guest_view/browser/guest_view_manager.cc
+++ b/chromium/components/guest_view/browser/guest_view_manager.cc
@@ -66,7 +66,7 @@ GuestViewManagerFactory* GuestViewManager::factory_ = nullptr;
 
 GuestViewManager::GuestViewManager(
     content::BrowserContext* context,
-    scoped_ptr<GuestViewManagerDelegate> delegate)
+    std::unique_ptr<GuestViewManagerDelegate> delegate)
     : current_instance_id_(0),
       last_instance_id_removed_(0),
       context_(context),
@@ -78,7 +78,7 @@ GuestViewManager::~GuestViewManager() {}
 // static
 GuestViewManager* GuestViewManager::CreateWithDelegate(
     BrowserContext* context,
-    scoped_ptr<GuestViewManagerDelegate> delegate) {
+    std::unique_ptr<GuestViewManagerDelegate> delegate) {
   GuestViewManager* guest_manager = FromBrowserContext(context);
   if (!guest_manager) {
     if (factory_) {
@@ -385,10 +385,11 @@ bool GuestViewManager::IsGuestAvailableToContext(GuestViewBase* guest) {
   return delegate_->IsGuestAvailableToContext(guest);
 }
 
-void GuestViewManager::DispatchEvent(const std::string& event_name,
-                                     scoped_ptr<base::DictionaryValue> args,
-                                     GuestViewBase* guest,
-                                     int instance_id) {
+void GuestViewManager::DispatchEvent(
+    const std::string& event_name,
+    std::unique_ptr<base::DictionaryValue> args,
+    GuestViewBase* guest,
+    int instance_id) {
   // TODO(fsamuel): GuestViewManager should probably do something more useful
   // here like log an error if the event could not be dispatched.
   delegate_->DispatchEvent(event_name, std::move(args), guest, instance_id);
diff --git a/chromium/components/guest_view/browser/guest_view_manager.h b/chromium/components/guest_view/browser/guest_view_manager.h
index 8eaefb3a7fa..033e2a2cd1b 100644
--- a/chromium/components/guest_view/browser/guest_view_manager.h
+++ b/chromium/components/guest_view/browser/guest_view_manager.h
@@ -6,13 +6,13 @@
 #define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_H_
 
 #include <map>
+#include <memory>
 #include <set>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/site_instance.h"
@@ -35,14 +35,14 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
                          public base::SupportsUserData::Data {
  public:
   GuestViewManager(content::BrowserContext* context,
-                   scoped_ptr<GuestViewManagerDelegate> delegate);
+                   std::unique_ptr<GuestViewManagerDelegate> delegate);
   ~GuestViewManager() override;
 
   // Returns the GuestViewManager associated with |context|. If one isn't
   // available, then it is created and returned.
   static GuestViewManager* CreateWithDelegate(
       content::BrowserContext* context,
-      scoped_ptr<GuestViewManagerDelegate> delegate);
+      std::unique_ptr<GuestViewManagerDelegate> delegate);
 
   // Returns the GuestViewManager associated with |context|. If one isn't
   // available, then nullptr is returned.
@@ -178,7 +178,7 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
   // Dispatches the event with |name| with the provided |args| to the embedder
   // of the given |guest| with |instance_id| for routing.
   void DispatchEvent(const std::string& event_name,
-                     scoped_ptr<base::DictionaryValue> args,
+                     std::unique_ptr<base::DictionaryValue> args,
                      GuestViewBase* guest,
                      int instance_id);
 
@@ -254,7 +254,7 @@ class GuestViewManager : public content::BrowserPluginGuestManager,
 
   content::BrowserContext* context_;
 
-  scoped_ptr<GuestViewManagerDelegate> delegate_;
+  std::unique_ptr<GuestViewManagerDelegate> delegate_;
 
   // This tracks which GuestView embedders are currently being observed.
   std::set<int> embedders_observed_;
diff --git a/chromium/components/guest_view/browser/guest_view_manager_delegate.h b/chromium/components/guest_view/browser/guest_view_manager_delegate.h
index 4323c57e49a..97474172ece 100644
--- a/chromium/components/guest_view/browser/guest_view_manager_delegate.h
+++ b/chromium/components/guest_view/browser/guest_view_manager_delegate.h
@@ -5,9 +5,9 @@
 #ifndef COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_DELEGATE_H_
 #define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_DELEGATE_H_
 
+#include <memory>
 #include <string>
 
-#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 namespace base {
@@ -39,7 +39,7 @@ class GuestViewManagerDelegate {
   // Dispatches the event with |name| with the provided |args| to the embedder
   // of the given |guest| with |instance_id| for routing.
   virtual void DispatchEvent(const std::string& event_name,
-                             scoped_ptr<base::DictionaryValue> args,
+                             std::unique_ptr<base::DictionaryValue> args,
                              GuestViewBase* guest,
                              int instance_id) {}
 
diff --git a/chromium/components/guest_view/browser/guest_view_manager_factory.h b/chromium/components/guest_view/browser/guest_view_manager_factory.h
index 0d127a321be..40949514296 100644
--- a/chromium/components/guest_view/browser/guest_view_manager_factory.h
+++ b/chromium/components/guest_view/browser/guest_view_manager_factory.h
@@ -5,6 +5,8 @@
 #ifndef COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_FACTORY_H_
 #define COMPONENTS_GUEST_VIEW_BROWSER_GUEST_VIEW_MANAGER_FACTORY_H_
 
+#include <memory>
+
 namespace content {
 class BrowserContext;
 }
@@ -18,7 +20,7 @@ class GuestViewManagerFactory {
  public:
   virtual GuestViewManager* CreateGuestViewManager(
       content::BrowserContext* context,
-      scoped_ptr<GuestViewManagerDelegate> delegate) = 0;
+      std::unique_ptr<GuestViewManagerDelegate> delegate) = 0;
 
  protected:
   virtual ~GuestViewManagerFactory() {}
diff --git a/chromium/components/guest_view/browser/guest_view_manager_unittest.cc b/chromium/components/guest_view/browser/guest_view_manager_unittest.cc
index 50689e716c6..aeec9016df1 100644
--- a/chromium/components/guest_view/browser/guest_view_manager_unittest.cc
+++ b/chromium/components/guest_view/browser/guest_view_manager_unittest.cc
@@ -4,6 +4,7 @@
 
 #include "components/guest_view/browser/guest_view_manager.h"
 
+#include <memory>
 #include <utility>
 
 #include "base/macros.h"
@@ -26,8 +27,8 @@ class GuestViewManagerTest : public content::RenderViewHostTestHarness {
   GuestViewManagerTest() {}
   ~GuestViewManagerTest() override {}
 
-  scoped_ptr<WebContents> CreateWebContents() {
-    return scoped_ptr<WebContents>(
+  std::unique_ptr<WebContents> CreateWebContents() {
+    return std::unique_ptr<WebContents>(
         WebContentsTester::CreateTestWebContents(&browser_context_, NULL));
   }
 
@@ -41,14 +42,14 @@ class GuestViewManagerTest : public content::RenderViewHostTestHarness {
 
 TEST_F(GuestViewManagerTest, AddRemove) {
   content::TestBrowserContext browser_context;
-  scoped_ptr<GuestViewManagerDelegate> delegate(
+  std::unique_ptr<GuestViewManagerDelegate> delegate(
       new GuestViewManagerDelegate());
-  scoped_ptr<TestGuestViewManager> manager(
+  std::unique_ptr<TestGuestViewManager> manager(
       new TestGuestViewManager(&browser_context, std::move(delegate)));
 
-  scoped_ptr<WebContents> web_contents1(CreateWebContents());
-  scoped_ptr<WebContents> web_contents2(CreateWebContents());
-  scoped_ptr<WebContents> web_contents3(CreateWebContents());
+  std::unique_ptr<WebContents> web_contents1(CreateWebContents());
+  std::unique_ptr<WebContents> web_contents2(CreateWebContents());
+  std::unique_ptr<WebContents> web_contents3(CreateWebContents());
 
   EXPECT_EQ(0, manager->last_instance_id_removed());
 
diff --git a/chromium/components/guest_view/browser/guest_view_message_filter.cc b/chromium/components/guest_view/browser/guest_view_message_filter.cc
index c7d1546d125..c1f65906caf 100644
--- a/chromium/components/guest_view/browser/guest_view_message_filter.cc
+++ b/chromium/components/guest_view/browser/guest_view_message_filter.cc
@@ -4,6 +4,7 @@
 
 #include "components/guest_view/browser/guest_view_message_filter.h"
 
+#include "base/memory/ptr_util.h"
 #include "components/guest_view/browser/guest_view_base.h"
 #include "components/guest_view/browser/guest_view_manager.h"
 #include "components/guest_view/browser/guest_view_manager_delegate.h"
@@ -51,8 +52,8 @@ GuestViewManager* GuestViewMessageFilter::GetOrCreateGuestViewManager() {
   auto manager = GuestViewManager::FromBrowserContext(browser_context_);
   if (!manager) {
     manager = GuestViewManager::CreateWithDelegate(
-        browser_context_,
-        scoped_ptr<GuestViewManagerDelegate>(new GuestViewManagerDelegate()));
+        browser_context_, base::WrapUnique(
+                              new GuestViewManagerDelegate()));
   }
   return manager;
 }
diff --git a/chromium/components/guest_view/browser/test_guest_view_manager.cc b/chromium/components/guest_view/browser/test_guest_view_manager.cc
index e088bae3650..66961b3aeac 100644
--- a/chromium/components/guest_view/browser/test_guest_view_manager.cc
+++ b/chromium/components/guest_view/browser/test_guest_view_manager.cc
@@ -6,14 +6,13 @@
 
 #include <utility>
 
-#include "base/memory/scoped_ptr.h"
 #include "components/guest_view/browser/guest_view_manager_delegate.h"
 
 namespace guest_view {
 
 TestGuestViewManager::TestGuestViewManager(
     content::BrowserContext* context,
-    scoped_ptr<GuestViewManagerDelegate> delegate)
+    std::unique_ptr<GuestViewManagerDelegate> delegate)
     : GuestViewManager(context, std::move(delegate)),
       num_embedder_processes_destroyed_(0),
       num_guests_created_(0),
@@ -146,7 +145,7 @@ TestGuestViewManagerFactory::~TestGuestViewManagerFactory() {
 
 GuestViewManager* TestGuestViewManagerFactory::CreateGuestViewManager(
     content::BrowserContext* context,
-    scoped_ptr<GuestViewManagerDelegate> delegate) {
+    std::unique_ptr<GuestViewManagerDelegate> delegate) {
   if (!test_guest_view_manager_) {
     test_guest_view_manager_ =
         new TestGuestViewManager(context, std::move(delegate));
diff --git a/chromium/components/guest_view/browser/test_guest_view_manager.h b/chromium/components/guest_view/browser/test_guest_view_manager.h
index 0682006e756..5c6f438ff74 100644
--- a/chromium/components/guest_view/browser/test_guest_view_manager.h
+++ b/chromium/components/guest_view/browser/test_guest_view_manager.h
@@ -7,6 +7,8 @@
 
 #include <stddef.h>
 
+#include <memory>
+
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
@@ -18,9 +20,8 @@ namespace guest_view {
 
 class TestGuestViewManager : public GuestViewManager {
  public:
-  TestGuestViewManager(
-      content::BrowserContext* context,
-      scoped_ptr<GuestViewManagerDelegate> delegate);
+  TestGuestViewManager(content::BrowserContext* context,
+                       std::unique_ptr<GuestViewManagerDelegate> delegate);
   ~TestGuestViewManager() override;
 
   void WaitForAllGuestsDeleted();
@@ -116,7 +117,7 @@ class TestGuestViewManagerFactory : public GuestViewManagerFactory {
 
   GuestViewManager* CreateGuestViewManager(
       content::BrowserContext* context,
-      scoped_ptr<GuestViewManagerDelegate> delegate) override;
+      std::unique_ptr<GuestViewManagerDelegate> delegate) override;
 
  private:
   TestGuestViewManager* test_guest_view_manager_;
diff --git a/chromium/components/guest_view/common/guest_view_message_generator.cc b/chromium/components/guest_view/common/guest_view_message_generator.cc
index 6a0bca159e1..a55a976a344 100644
--- a/chromium/components/guest_view/common/guest_view_message_generator.cc
+++ b/chromium/components/guest_view/common/guest_view_message_generator.cc
@@ -14,6 +14,12 @@
 #include "ipc/struct_destructor_macros.h"
 #include "components/guest_view/common/guest_view_message_generator.h"
 
+// Generate param traits size methods.
+#include "ipc/param_traits_size_macros.h"
+namespace IPC {
+#include "components/guest_view/common/guest_view_message_generator.h"
+}  // namespace IPC
+
 // Generate param traits write methods.
 #include "ipc/param_traits_write_macros.h"
 namespace IPC {
diff --git a/chromium/components/guest_view/renderer/guest_view_container.h b/chromium/components/guest_view/renderer/guest_view_container.h
index b8c1270edef..65133525fcf 100644
--- a/chromium/components/guest_view/renderer/guest_view_container.h
+++ b/chromium/components/guest_view/renderer/guest_view_container.h
@@ -5,9 +5,10 @@
 #ifndef COMPONENTS_GUEST_VIEW_RENDERER_GUEST_VIEW_CONTAINER_H_
 #define COMPONENTS_GUEST_VIEW_RENDERER_GUEST_VIEW_CONTAINER_H_
 
+#include <memory>
+
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
 #include "content/public/renderer/browser_plugin_delegate.h"
 #include "ipc/ipc_message.h"
 #include "v8/include/v8.h"
@@ -85,7 +86,7 @@ class GuestViewContainer : public content::BrowserPluginDelegate {
 
   int element_instance_id_;
   content::RenderFrame* render_frame_;
-  scoped_ptr<RenderFrameLifetimeObserver> render_frame_lifetime_observer_;
+  std::unique_ptr<RenderFrameLifetimeObserver> render_frame_lifetime_observer_;
 
   bool in_destruction_;
 
diff --git a/chromium/components/guest_view/renderer/guest_view_container_dispatcher.h b/chromium/components/guest_view/renderer/guest_view_container_dispatcher.h
index 6bb98cf98e4..8b6b3277d24 100644
--- a/chromium/components/guest_view/renderer/guest_view_container_dispatcher.h
+++ b/chromium/components/guest_view/renderer/guest_view_container_dispatcher.h
@@ -7,14 +7,13 @@
 
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
-#include "content/public/renderer/render_process_observer.h"
+#include "content/public/renderer/render_thread_observer.h"
 #include "ipc/ipc_message.h"
 
 namespace guest_view {
 
 // Dispatcher used to route messages to GuestViewContainer.
-class GuestViewContainerDispatcher : public content::RenderProcessObserver {
+class GuestViewContainerDispatcher : public content::RenderThreadObserver {
  public:
   GuestViewContainerDispatcher();
   ~GuestViewContainerDispatcher() override;
@@ -24,7 +23,7 @@ class GuestViewContainerDispatcher : public content::RenderProcessObserver {
   virtual bool HandlesMessage(const IPC::Message& message);
 
  private:
-  // content::RenderProcessObserver implementation.
+  // content::RenderThreadObserver implementation.
   bool OnControlMessageReceived(const IPC::Message& message) override;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewContainerDispatcher);
diff --git a/chromium/components/guest_view/renderer/guest_view_request.cc b/chromium/components/guest_view/renderer/guest_view_request.cc
index fead0c5f06a..bf7ea55f131 100644
--- a/chromium/components/guest_view/renderer/guest_view_request.cc
+++ b/chromium/components/guest_view/renderer/guest_view_request.cc
@@ -30,7 +30,7 @@ GuestViewRequest::~GuestViewRequest() {
 
 void GuestViewRequest::ExecuteCallbackIfAvailable(
     int argc,
-    scoped_ptr<v8::Local<v8::Value>[]> argv) {
+    std::unique_ptr<v8::Local<v8::Value>[]> argv) {
   if (callback_.IsEmpty())
     return;
 
@@ -51,7 +51,7 @@ void GuestViewRequest::ExecuteCallbackIfAvailable(
 GuestViewAttachRequest::GuestViewAttachRequest(
     GuestViewContainer* container,
     int guest_instance_id,
-    scoped_ptr<base::DictionaryValue> params,
+    std::unique_ptr<base::DictionaryValue> params,
     v8::Local<v8::Function> callback,
     v8::Isolate* isolate)
     : GuestViewRequest(container, callback, isolate),
@@ -102,7 +102,7 @@ void GuestViewAttachRequest::HandleResponse(const IPC::Message& message) {
   }
 
   const int argc = 1;
-  scoped_ptr<v8::Local<v8::Value>[]> argv(new v8::Local<v8::Value>[argc]);
+  std::unique_ptr<v8::Local<v8::Value>[]> argv(new v8::Local<v8::Value>[argc]);
   argv[0] = window;
 
   // Call the AttachGuest API's callback with the guest proxy as the first
diff --git a/chromium/components/guest_view/renderer/guest_view_request.h b/chromium/components/guest_view/renderer/guest_view_request.h
index 054b25344b8..1055f2c5c8a 100644
--- a/chromium/components/guest_view/renderer/guest_view_request.h
+++ b/chromium/components/guest_view/renderer/guest_view_request.h
@@ -5,8 +5,9 @@
 #ifndef COMPONENTS_GUEST_VIEW_RENDERER_GUEST_VIEW_REQUEST_H_
 #define COMPONENTS_GUEST_VIEW_RENDERER_GUEST_VIEW_REQUEST_H_
 
+#include <memory>
+
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "ipc/ipc_message.h"
 #include "v8/include/v8.h"
 
@@ -40,7 +41,7 @@ class GuestViewRequest {
   // Note: the callback may be called even if a response has not been heard from
   // the browser process if the GuestViewContainer is being torn down.
   void ExecuteCallbackIfAvailable(int argc,
-                                  scoped_ptr<v8::Local<v8::Value>[]> argv);
+                                  std::unique_ptr<v8::Local<v8::Value>[]> argv);
 
   GuestViewContainer* container() const { return container_; }
 
@@ -60,21 +61,21 @@ class GuestViewRequest {
 // other GuestViewRequests in flight.
 class GuestViewAttachRequest : public GuestViewRequest {
   public:
-  GuestViewAttachRequest(GuestViewContainer* container,
-                         int guest_instance_id,
-                         scoped_ptr<base::DictionaryValue> params,
-                         v8::Local<v8::Function> callback,
-                         v8::Isolate* isolate);
-  ~GuestViewAttachRequest() override;
+   GuestViewAttachRequest(GuestViewContainer* container,
+                          int guest_instance_id,
+                          std::unique_ptr<base::DictionaryValue> params,
+                          v8::Local<v8::Function> callback,
+                          v8::Isolate* isolate);
+   ~GuestViewAttachRequest() override;
 
-  void PerformRequest() override;
-  void HandleResponse(const IPC::Message& message) override;
+   void PerformRequest() override;
+   void HandleResponse(const IPC::Message& message) override;
 
- private:
-  const int guest_instance_id_;
-  scoped_ptr<base::DictionaryValue> params_;
+  private:
+   const int guest_instance_id_;
+   std::unique_ptr<base::DictionaryValue> params_;
 
-  DISALLOW_COPY_AND_ASSIGN(GuestViewAttachRequest);
+   DISALLOW_COPY_AND_ASSIGN(GuestViewAttachRequest);
 };
 
 // This class represents a DetachGuest request from Javascript. The Detach
diff --git a/chromium/components/guest_view/renderer/iframe_guest_view_request.cc b/chromium/components/guest_view/renderer/iframe_guest_view_request.cc
index a1555a02234..08545af43b9 100644
--- a/chromium/components/guest_view/renderer/iframe_guest_view_request.cc
+++ b/chromium/components/guest_view/renderer/iframe_guest_view_request.cc
@@ -16,7 +16,7 @@ GuestViewAttachIframeRequest::GuestViewAttachIframeRequest(
     guest_view::GuestViewContainer* container,
     int render_frame_routing_id,
     int guest_instance_id,
-    scoped_ptr<base::DictionaryValue> params,
+    std::unique_ptr<base::DictionaryValue> params,
     v8::Local<v8::Function> callback,
     v8::Isolate* isolate)
     : GuestViewRequest(container, callback, isolate),
diff --git a/chromium/components/guest_view/renderer/iframe_guest_view_request.h b/chromium/components/guest_view/renderer/iframe_guest_view_request.h
index 9236b7f2807..fa97ad17fef 100644
--- a/chromium/components/guest_view/renderer/iframe_guest_view_request.h
+++ b/chromium/components/guest_view/renderer/iframe_guest_view_request.h
@@ -5,6 +5,8 @@
 #ifndef COMPONENTS_GUEST_VIEW_RENDERER_IFRAME_GUEST_VIEW_REQUEST_H_
 #define COMPONENTS_GUEST_VIEW_RENDERER_IFRAME_GUEST_VIEW_REQUEST_H_
 
+#include <memory>
+
 #include "base/macros.h"
 #include "components/guest_view/renderer/guest_view_request.h"
 #include "ipc/ipc_message.h"
@@ -21,7 +23,7 @@ class GuestViewAttachIframeRequest : public guest_view::GuestViewRequest {
   GuestViewAttachIframeRequest(GuestViewContainer* container,
                                int render_frame_routing_id,
                                int guest_instance_id,
-                               scoped_ptr<base::DictionaryValue> params,
+                               std::unique_ptr<base::DictionaryValue> params,
                                v8::Local<v8::Function> callback,
                                v8::Isolate* isolate);
   ~GuestViewAttachIframeRequest() override;
@@ -32,7 +34,7 @@ class GuestViewAttachIframeRequest : public guest_view::GuestViewRequest {
  private:
   const int render_frame_routing_id_;
   const int guest_instance_id_;
-  scoped_ptr<base::DictionaryValue> params_;
+  std::unique_ptr<base::DictionaryValue> params_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewAttachIframeRequest);
 };