Convert //components/[u-z]* from scoped_ptr to std::unique_ptr

components/web_modal/web_contents_modal_dialog_manager_unittest.cc

Index: components/web_modal/web_contents_modal_dialog_manager_unittest.cc
diff --git a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
index 0cb10999e11a4d505095b39b103206d886442d9c..75c749eb1c8c15acff9e6b3e9f9ed919724a04d2 100644
--- a/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
+++ b/components/web_modal/web_contents_modal_dialog_manager_unittest.cc
@@ -5,9 +5,10 @@
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 
 #include <map>
+#include <memory>
 
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "components/web_modal/single_web_contents_dialog_manager.h"
 #include "components/web_modal/test_web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/test/test_renderer_host.h"
@@ -115,9 +116,9 @@ class WebContentsModalDialogManagerTest
   }
 
   int next_dialog_id;
-  scoped_ptr<TestWebContentsModalDialogManagerDelegate> delegate;
+  std::unique_ptr<TestWebContentsModalDialogManagerDelegate> delegate;
   WebContentsModalDialogManager* manager;
-  scoped_ptr<WebContentsModalDialogManager::TestApi> test_api;
+  std::unique_ptr<WebContentsModalDialogManager::TestApi> test_api;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogManagerTest);
 };
@@ -142,8 +143,7 @@ TEST_F(WebContentsModalDialogManagerTest, WebContentsVisible) {
   NativeManagerTracker tracker;
   TestNativeWebContentsModalDialogManager* native_manager =
       new TestNativeWebContentsModalDialogManager(dialog, manager, &tracker);
-  manager->ShowDialogWithManager(
-      dialog, scoped_ptr<SingleWebContentsDialogManager>(native_manager));
+  manager->ShowDialogWithManager(dialog, base::WrapUnique(native_manager));
 
   EXPECT_EQ(NativeManagerTracker::SHOWN, tracker.state_);
   EXPECT_TRUE(manager->IsDialogActive());
@@ -164,8 +164,7 @@ TEST_F(WebContentsModalDialogManagerTest, WebContentsNotVisible) {
   NativeManagerTracker tracker;
   TestNativeWebContentsModalDialogManager* native_manager =
       new TestNativeWebContentsModalDialogManager(dialog, manager, &tracker);
-  manager->ShowDialogWithManager(
-      dialog, scoped_ptr<SingleWebContentsDialogManager>(native_manager));
+  manager->ShowDialogWithManager(dialog, base::WrapUnique(native_manager));
 
   EXPECT_EQ(NativeManagerTracker::NOT_SHOWN, tracker.state_);
   EXPECT_TRUE(manager->IsDialogActive());
@@ -190,12 +189,9 @@ TEST_F(WebContentsModalDialogManagerTest, ShowDialogs) {
       new TestNativeWebContentsModalDialogManager(dialog2, manager, &tracker2);
   TestNativeWebContentsModalDialogManager* native_manager3 =
       new TestNativeWebContentsModalDialogManager(dialog3, manager, &tracker3);
-  manager->ShowDialogWithManager(
-      dialog1, scoped_ptr<SingleWebContentsDialogManager>(native_manager1));
-  manager->ShowDialogWithManager(
-      dialog2, scoped_ptr<SingleWebContentsDialogManager>(native_manager2));
-  manager->ShowDialogWithManager(
-      dialog3, scoped_ptr<SingleWebContentsDialogManager>(native_manager3));
+  manager->ShowDialogWithManager(dialog1, base::WrapUnique(native_manager1));
+  manager->ShowDialogWithManager(dialog2, base::WrapUnique(native_manager2));
+  manager->ShowDialogWithManager(dialog3, base::WrapUnique(native_manager3));
 
   EXPECT_TRUE(delegate->web_contents_blocked());
   EXPECT_EQ(NativeManagerTracker::SHOWN, tracker1.state_);
@@ -214,8 +210,7 @@ TEST_F(WebContentsModalDialogManagerTest, VisibilityObservation) {
   NativeManagerTracker tracker;
   TestNativeWebContentsModalDialogManager* native_manager =
       new TestNativeWebContentsModalDialogManager(dialog, manager, &tracker);
-  manager->ShowDialogWithManager(
-      dialog, scoped_ptr<SingleWebContentsDialogManager>(native_manager));
+  manager->ShowDialogWithManager(dialog, base::WrapUnique(native_manager));
 
   EXPECT_TRUE(manager->IsDialogActive());
   EXPECT_TRUE(delegate->web_contents_blocked());
@@ -247,10 +242,8 @@ TEST_F(WebContentsModalDialogManagerTest, InterstitialPage) {
       new TestNativeWebContentsModalDialogManager(dialog1, manager, &tracker1);
   TestNativeWebContentsModalDialogManager* native_manager2 =
       new TestNativeWebContentsModalDialogManager(dialog2, manager, &tracker2);
-  manager->ShowDialogWithManager(
-      dialog1, scoped_ptr<SingleWebContentsDialogManager>(native_manager1));
-  manager->ShowDialogWithManager(
-      dialog2, scoped_ptr<SingleWebContentsDialogManager>(native_manager2));
+  manager->ShowDialogWithManager(dialog1, base::WrapUnique(native_manager1));
+  manager->ShowDialogWithManager(dialog2, base::WrapUnique(native_manager2));
 
   test_api->DidAttachInterstitialPage();
 
@@ -283,14 +276,10 @@ TEST_F(WebContentsModalDialogManagerTest, CloseDialogs) {
       new TestNativeWebContentsModalDialogManager(dialog3, manager, &tracker3);
   TestNativeWebContentsModalDialogManager* native_manager4 =
       new TestNativeWebContentsModalDialogManager(dialog4, manager, &tracker4);
-  manager->ShowDialogWithManager(
-      dialog1, scoped_ptr<SingleWebContentsDialogManager>(native_manager1));
-  manager->ShowDialogWithManager(
-      dialog2, scoped_ptr<SingleWebContentsDialogManager>(native_manager2));
-  manager->ShowDialogWithManager(
-      dialog3, scoped_ptr<SingleWebContentsDialogManager>(native_manager3));
-  manager->ShowDialogWithManager(
-      dialog4, scoped_ptr<SingleWebContentsDialogManager>(native_manager4));
+  manager->ShowDialogWithManager(dialog1, base::WrapUnique(native_manager1));
+  manager->ShowDialogWithManager(dialog2, base::WrapUnique(native_manager2));
+  manager->ShowDialogWithManager(dialog3, base::WrapUnique(native_manager3));
+  manager->ShowDialogWithManager(dialog4, base::WrapUnique(native_manager4));
 
   native_manager1->Close();
 
@@ -345,8 +334,8 @@ TEST_F(WebContentsModalDialogManagerTest, CloseAllDialogs) {
     native_managers[i] =
         new TestNativeWebContentsModalDialogManager(
             dialog, manager, &(trackers[i]));
-    manager->ShowDialogWithManager(
-        dialog, scoped_ptr<SingleWebContentsDialogManager>(native_managers[i]));
+    manager->ShowDialogWithManager(dialog,
+                                   base::WrapUnique(native_managers[i]));
   }
 
   for (int i = 0; i < kWindowCount; i++)