Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc

Index: chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
index 8183aa653ef012002b34fc17200c7a2afef265ad..6e8d17ae2858cb4a7f8bd6d08ce482401ca2881e 100644
--- a/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_ui_unittest.cc
@@ -2,14 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/ui/webui/media_router/media_router_ui.h"
+
 #include "base/bind.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/media/router/media_route.h"
 #include "chrome/browser/media/router/mock_media_router.h"
 #include "chrome/browser/media/router/route_request_result.h"
 #include "chrome/browser/media/router/test_helper.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
-#include "chrome/browser/ui/webui/media_router/media_router_ui.h"
 #include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/testing_profile.h"
@@ -70,11 +72,11 @@ class MediaRouterUITest : public ::testing::Test {
   MockMediaRouter mock_router_;
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
-  scoped_ptr<content::WebContents> initiator_;
+  std::unique_ptr<content::WebContents> initiator_;
   content::TestWebUI web_ui_;
-  scoped_ptr<content::WebContents> web_contents_;
-  scoped_ptr<MediaRouterUI> media_router_ui_;
-  scoped_ptr<MediaRouterWebUIMessageHandler> message_handler_;
+  std::unique_ptr<content::WebContents> web_contents_;
+  std::unique_ptr<MediaRouterUI> media_router_ui_;
+  std::unique_ptr<MediaRouterWebUIMessageHandler> message_handler_;
 };
 
 TEST_F(MediaRouterUITest, RouteCreationTimeoutForTab) {
@@ -89,7 +91,7 @@ TEST_F(MediaRouterUITest, RouteCreationTimeoutForTab) {
   std::string expected_title = l10n_util::GetStringUTF8(
       IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_TAB);
   EXPECT_CALL(mock_router_, AddIssue(IssueTitleEquals(expected_title)));
-  scoped_ptr<RouteRequestResult> result =
+  std::unique_ptr<RouteRequestResult> result =
       RouteRequestResult::FromError("Timed out", RouteRequestResult::TIMED_OUT);
   for (const auto& callback : callbacks)
     callback.Run(*result);
@@ -107,7 +109,7 @@ TEST_F(MediaRouterUITest, RouteCreationTimeoutForDesktop) {
   std::string expected_title = l10n_util::GetStringUTF8(
       IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT_FOR_DESKTOP);
   EXPECT_CALL(mock_router_, AddIssue(IssueTitleEquals(expected_title)));
-  scoped_ptr<RouteRequestResult> result =
+  std::unique_ptr<RouteRequestResult> result =
       RouteRequestResult::FromError("Timed out", RouteRequestResult::TIMED_OUT);
   for (const auto& callback : callbacks)
     callback.Run(*result);
@@ -130,7 +132,7 @@ TEST_F(MediaRouterUITest, RouteCreationTimeoutForPresentation) {
       l10n_util::GetStringFUTF8(IDS_MEDIA_ROUTER_ISSUE_CREATE_ROUTE_TIMEOUT,
                                 base::UTF8ToUTF16("frameurl.fakeurl"));
   EXPECT_CALL(mock_router_, AddIssue(IssueTitleEquals(expected_title)));
-  scoped_ptr<RouteRequestResult> result =
+  std::unique_ptr<RouteRequestResult> result =
       RouteRequestResult::FromError("Timed out", RouteRequestResult::TIMED_OUT);
   for (const auto& callback : callbacks)
     callback.Run(*result);
@@ -182,7 +184,7 @@ TEST_F(MediaRouterUITest, UIMediaRoutesObserverFiltersNonDisplayRoutes) {
   EXPECT_CALL(mock_router_, RegisterMediaRoutesObserver(_)).Times(1);
   MediaSource media_source("mediaSource");
   MockRoutesUpdatedCallback mock_callback;
-  scoped_ptr<MediaRouterUI::UIMediaRoutesObserver> observer(
+  std::unique_ptr<MediaRouterUI::UIMediaRoutesObserver> observer(
       new MediaRouterUI::UIMediaRoutesObserver(
           &mock_router_, media_source.id(),
           base::Bind(&MockRoutesUpdatedCallback::OnRoutesUpdated,
@@ -220,7 +222,7 @@ TEST_F(MediaRouterUITest,
   EXPECT_CALL(mock_router_, RegisterMediaRoutesObserver(_)).Times(1);
   MediaSource media_source("mediaSource");
   MockRoutesUpdatedCallback mock_callback;
-  scoped_ptr<MediaRouterUI::UIMediaRoutesObserver> observer(
+  std::unique_ptr<MediaRouterUI::UIMediaRoutesObserver> observer(
       new MediaRouterUI::UIMediaRoutesObserver(
           &mock_router_, media_source.id(),
           base::Bind(&MockRoutesUpdatedCallback::OnRoutesUpdated,
@@ -260,8 +262,8 @@ TEST_F(MediaRouterUITest,
 TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) {
   std::string id = "extensionid";
   GURL url = GURL("chrome-extension://" + id);
-  scoped_ptr<extensions::ExtensionRegistry> registry =
-      make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
+  std::unique_ptr<extensions::ExtensionRegistry> registry =
+      base::WrapUnique(new extensions::ExtensionRegistry(nullptr));
   scoped_refptr<extensions::Extension> app =
       extensions::test_util::BuildApp(extensions::ExtensionBuilder())
           .MergeManifest(extensions::DictionaryBuilder()
@@ -278,16 +280,16 @@ TEST_F(MediaRouterUITest, GetExtensionNameExtensionPresent) {
 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotInstalled) {
   std::string id = "extensionid";
   GURL url = GURL("chrome-extension://" + id);
-  scoped_ptr<extensions::ExtensionRegistry> registry =
-      make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
+  std::unique_ptr<extensions::ExtensionRegistry> registry =
+      base::WrapUnique(new extensions::ExtensionRegistry(nullptr));
 
   EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
 }
 
 TEST_F(MediaRouterUITest, GetExtensionNameEmptyWhenNotExtensionURL) {
   GURL url = GURL("https://www.google.com");
-  scoped_ptr<extensions::ExtensionRegistry> registry =
-      make_scoped_ptr(new extensions::ExtensionRegistry(nullptr));
+  std::unique_ptr<extensions::ExtensionRegistry> registry =
+      base::WrapUnique(new extensions::ExtensionRegistry(nullptr));
 
   EXPECT_EQ("", MediaRouterUI::GetExtensionName(url, registry.get()));
 }