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

chrome/browser/extensions/api/sessions/sessions_apitest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
+
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/pattern.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/api/sessions/sessions_api.h"
 #include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/chrome_sync_client.h"
@@ skipping 69 matching lines @@
   navigation->set_title("MyTitle");
   navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
 }
 
 class ExtensionSessionsTest : public InProcessBrowserTest {
  public:
   void SetUpCommandLine(base::CommandLine* command_line) override;
   void SetUpOnMainThread() override;
 
  protected:
-  static scoped_ptr<KeyedService> BuildProfileSyncService(
+  static std::unique_ptr<KeyedService> BuildProfileSyncService(
       content::BrowserContext* profile);
 
   void CreateTestProfileSyncService();
   void CreateTestExtension();
   void CreateSessionModels();
 
   template <class T>
   scoped_refptr<T> CreateFunction(bool has_callback) {
     scoped_refptr<T> fn(new T());
     fn->set_extension(extension_.get());
@@ skipping 10 matching lines @@
   command_line->AppendSwitch(
       chromeos::switches::kIgnoreUserProfileMappingForTests);
 #endif
 }
 
 void ExtensionSessionsTest::SetUpOnMainThread() {
   CreateTestProfileSyncService();
   CreateTestExtension();
 }
 
-scoped_ptr<KeyedService> ExtensionSessionsTest::BuildProfileSyncService(
+std::unique_ptr<KeyedService> ExtensionSessionsTest::BuildProfileSyncService(
     content::BrowserContext* context) {
-  scoped_ptr<SyncApiComponentFactoryMock> factory(
+  std::unique_ptr<SyncApiComponentFactoryMock> factory(
       new SyncApiComponentFactoryMock());
 
   factory->SetLocalDeviceInfoProvider(
-      scoped_ptr<sync_driver::LocalDeviceInfoProvider>(
+      std::unique_ptr<sync_driver::LocalDeviceInfoProvider>(
           new sync_driver::LocalDeviceInfoProviderMock(
-              kSessionTags[0],
-              "machine name",
-              "Chromium 10k",
-              "Chrome 10k",
-              sync_pb::SyncEnums_DeviceType_TYPE_LINUX,
-              "device_id")));
+              kSessionTags[0], "machine name", "Chromium 10k", "Chrome 10k",
+              sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id")));
 
   Profile* profile = static_cast<Profile*>(context);
   ProfileSyncServiceMock* sync_service =
       new ProfileSyncServiceMock(CreateProfileSyncServiceParamsForTest(
-          make_scoped_ptr(new browser_sync::ChromeSyncClient(profile)),
+          base::WrapUnique(new browser_sync::ChromeSyncClient(profile)),
           profile));
   static_cast<browser_sync::ChromeSyncClient*>(sync_service->GetSyncClient())
       ->SetSyncApiComponentFactoryForTesting(std::move(factory));
-  return make_scoped_ptr(sync_service);
+  return base::WrapUnique(sync_service);
 }
 
 void ExtensionSessionsTest::CreateTestProfileSyncService() {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   base::FilePath path;
   PathService::Get(chrome::DIR_USER_DATA, &path);
   path = path.AppendASCII("test_profile");
   if (!base::PathExists(path))
     CHECK(base::CreateDirectory(path));
   Profile* profile =
@@ skipping 19 matching lines @@
 
   EXPECT_CALL(*service, AddObserver(testing::_)).Times(testing::AnyNumber());
   EXPECT_CALL(*service, RemoveObserver(testing::_)).Times(testing::AnyNumber());
 
   browser_ = new Browser(Browser::CreateParams(profile));
 
   service->Initialize();
 }
 
 void ExtensionSessionsTest::CreateTestExtension() {
-  scoped_ptr<base::DictionaryValue> test_extension_value(
+  std::unique_ptr<base::DictionaryValue> test_extension_value(
       api_test_utils::ParseDictionary(
           "{\"name\": \"Test\", \"version\": \"1.0\", "
           "\"permissions\": [\"sessions\", \"tabs\"]}"));
   extension_ = api_test_utils::CreateExtension(test_extension_value.get());
 }
 
 void ExtensionSessionsTest::CreateSessionModels() {
   syncer::SyncDataList initial_data;
   for (size_t index = 0; index < arraysize(kSessionTags); ++index) {
     // Fill an instance of session specifics with a foreign session's data.
@@ skipping 20 matching lines @@
       entity.mutable_session()->CopyFrom(tabs[i]);
       initial_data.push_back(syncer::SyncData::CreateRemoteData(
           i + 2,
           entity,
           base::Time(),
           syncer::AttachmentIdList(),
           syncer::AttachmentServiceProxyForTest::Create()));
     }
   }
 
-  ProfileSyncServiceFactory::GetForProfile(browser_->profile())->
-      GetSessionsSyncableService()->
-          MergeDataAndStartSyncing(syncer::SESSIONS, initial_data,
-      scoped_ptr<syncer::SyncChangeProcessor>(
-          new syncer::FakeSyncChangeProcessor()),
-      scoped_ptr<syncer::SyncErrorFactory>(
-          new syncer::SyncErrorFactoryMock()));
+  ProfileSyncServiceFactory::GetForProfile(browser_->profile())
+      ->GetSessionsSyncableService()
+      ->MergeDataAndStartSyncing(syncer::SESSIONS, initial_data,
+                                 std::unique_ptr<syncer::SyncChangeProcessor>(
+                                     new syncer::FakeSyncChangeProcessor()),
+                                 std::unique_ptr<syncer::SyncErrorFactory>(
+                                     new syncer::SyncErrorFactoryMock()));
 }
 
 testing::AssertionResult CheckSessionModels(const base::ListValue& devices,
                                             size_t num_sessions) {
   EXPECT_EQ(5u, devices.GetSize());
   const base::DictionaryValue* device = NULL;
   const base::ListValue* sessions = NULL;
   for (size_t i = 0; i < devices.GetSize(); ++i) {
     EXPECT_TRUE(devices.GetDictionary(i, &device));
     EXPECT_EQ(kSessionTags[i], api_test_utils::GetString(device, "info"));
@@ skipping 33 matching lines @@
                 api_test_utils::GetString(tab, "favIconUrl"));
       EXPECT_EQ(base::StringPrintf("%s.%d", kSessionTags[i], kTabIDs[j]),
                 api_test_utils::GetString(tab, "sessionId"));
     }
   }
   return testing::AssertionSuccess();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest, GetDevices) {
   CreateSessionModels();
-  scoped_ptr<base::ListValue> result(utils::ToList(
-      utils::RunFunctionAndReturnSingleResult(
+  std::unique_ptr<base::ListValue> result(
+      utils::ToList(utils::RunFunctionAndReturnSingleResult(
           CreateFunction<SessionsGetDevicesFunction>(true).get(),
-          "[{\"maxResults\": 0}]",
-          browser_)));
+          "[{\"maxResults\": 0}]", browser_)));
   ASSERT_TRUE(result);
   EXPECT_TRUE(CheckSessionModels(*result, 0u));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest, GetDevicesMaxResults) {
   CreateSessionModels();
-  scoped_ptr<base::ListValue> result(utils::ToList(
-      utils::RunFunctionAndReturnSingleResult(
-          CreateFunction<SessionsGetDevicesFunction>(true).get(),
-          "[]",
+  std::unique_ptr<base::ListValue> result(
+      utils::ToList(utils::RunFunctionAndReturnSingleResult(
+          CreateFunction<SessionsGetDevicesFunction>(true).get(), "[]",
           browser_)));
   ASSERT_TRUE(result);
   EXPECT_TRUE(CheckSessionModels(*result, 1u));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest, GetDevicesListEmpty) {
-  scoped_ptr<base::ListValue> result(utils::ToList(
-      utils::RunFunctionAndReturnSingleResult(
-          CreateFunction<SessionsGetDevicesFunction>(true).get(),
-          "[]",
+  std::unique_ptr<base::ListValue> result(
+      utils::ToList(utils::RunFunctionAndReturnSingleResult(
+          CreateFunction<SessionsGetDevicesFunction>(true).get(), "[]",
           browser_)));
 
   ASSERT_TRUE(result);
   base::ListValue* devices = result.get();
   EXPECT_EQ(0u, devices->GetSize());
 }
 
 // Flaky timeout: http://crbug.com/278372
 IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest,
                        DISABLED_RestoreForeignSessionWindow) {
   CreateSessionModels();
 
-  scoped_ptr<base::DictionaryValue> restored_window_session(utils::ToDictionary(
-      utils::RunFunctionAndReturnSingleResult(
-          CreateFunction<SessionsRestoreFunction>(true).get(),
-          "[\"tag3.3\"]",
-          browser_,
-          utils::INCLUDE_INCOGNITO)));
+  std::unique_ptr<base::DictionaryValue> restored_window_session(
+      utils::ToDictionary(utils::RunFunctionAndReturnSingleResult(
+          CreateFunction<SessionsRestoreFunction>(true).get(), "[\"tag3.3\"]",
+          browser_, utils::INCLUDE_INCOGNITO)));
   ASSERT_TRUE(restored_window_session);
 
-  scoped_ptr<base::ListValue> result(utils::ToList(
-      utils::RunFunctionAndReturnSingleResult(
-          CreateFunction<WindowsGetAllFunction>(true).get(),
-          "[]",
-          browser_)));
+  std::unique_ptr<base::ListValue> result(
+      utils::ToList(utils::RunFunctionAndReturnSingleResult(
+          CreateFunction<WindowsGetAllFunction>(true).get(), "[]", browser_)));
   ASSERT_TRUE(result);
 
   base::ListValue* windows = result.get();
   EXPECT_EQ(2u, windows->GetSize());
   base::DictionaryValue* restored_window = NULL;
   EXPECT_TRUE(restored_window_session->GetDictionary("window",
                                                      &restored_window));
   base::DictionaryValue* window = NULL;
   int restored_id = api_test_utils::GetInteger(restored_window, "id");
   for (size_t i = 0; i < windows->GetSize(); ++i) {
@@ skipping 17 matching lines @@
   CreateSessionModels();
 
   EXPECT_TRUE(base::MatchPattern(utils::RunFunctionAndReturnError(
       CreateFunction<SessionsRestoreFunction>(true).get(),
       "[\"1\"]",
       CreateIncognitoBrowser()),
       "Can not restore sessions in incognito mode."));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionSessionsTest, GetRecentlyClosedIncognito) {
-  scoped_ptr<base::ListValue> result(utils::ToList(
-      utils::RunFunctionAndReturnSingleResult(
-          CreateFunction<SessionsGetRecentlyClosedFunction>(true).get(),
-          "[]",
+  std::unique_ptr<base::ListValue> result(
+      utils::ToList(utils::RunFunctionAndReturnSingleResult(
+          CreateFunction<SessionsGetRecentlyClosedFunction>(true).get(), "[]",
           CreateIncognitoBrowser())));
   ASSERT_TRUE(result);
   base::ListValue* sessions = result.get();
   EXPECT_EQ(0u, sessions->GetSize());
 }
 
 // http://crbug.com/251199
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_SessionsApis) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshBrowserTests))
     return;
 #endif
 
   ASSERT_TRUE(RunExtensionSubtest("sessions",
                                   "sessions.html")) << message_;
 }
 
 }  // namespace
 
 }  // namespace extensions