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

chrome/browser/supervised_user/supervised_user_whitelist_service_unittest.cc

 // Copyright 2014 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 "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
+
 #include <map>
+#include <memory>
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
 #include "chrome/browser/supervised_user/supervised_user_site_list.h"
-#include "chrome/browser/supervised_user/supervised_user_whitelist_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_error_factory.h"
 #include "sync/protocol/sync.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 68 matching lines @@
                    base::Unretained(this)));
   }
 
  protected:
   void PrepareInitialStateAndPreferences() {
     // Create two whitelists.
     DictionaryPrefUpdate update(profile_.GetPrefs(),
                                 prefs::kSupervisedUserWhitelists);
     base::DictionaryValue* dict = update.Get();
 
-    scoped_ptr<base::DictionaryValue> whitelist_dict(new base::DictionaryValue);
+    std::unique_ptr<base::DictionaryValue> whitelist_dict(
+        new base::DictionaryValue);
     whitelist_dict->SetString("name", "Whitelist A");
     dict->Set("aaaa", whitelist_dict.release());
 
     whitelist_dict.reset(new base::DictionaryValue);
     whitelist_dict->SetString("name", "Whitelist B");
     dict->Set("bbbb", whitelist_dict.release());
 
     installer_->RegisterWhitelist(kClientId, "aaaa", "Whitelist A");
     installer_->RegisterWhitelist(kClientId, "bbbb", "Whitelist B");
   }
@@ skipping 35 matching lines @@
       site_lists_changed_callback_.Run();
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
 
 #if !defined(OS_ANDROID)
   safe_json::TestingJsonParser::ScopedFactoryOverride factory_override_;
 #endif
 
-  scoped_ptr<MockSupervisedUserWhitelistInstaller> installer_;
-  scoped_ptr<SupervisedUserWhitelistService> service_;
+  std::unique_ptr<MockSupervisedUserWhitelistInstaller> installer_;
+  std::unique_ptr<SupervisedUserWhitelistService> service_;
 
   std::vector<scoped_refptr<SupervisedUserSiteList>> site_lists_;
   base::Closure site_lists_changed_callback_;
 };
 
 TEST_F(SupervisedUserWhitelistServiceTest, MergeEmpty) {
   service_->Init();
 
   syncer::SyncMergeResult result = service_->MergeDataAndStartSyncing(
       syncer::SUPERVISED_USER_WHITELISTS, syncer::SyncDataList(),
-      scoped_ptr<syncer::SyncChangeProcessor>(),
-      scoped_ptr<syncer::SyncErrorFactory>());
+      std::unique_ptr<syncer::SyncChangeProcessor>(),
+      std::unique_ptr<syncer::SyncErrorFactory>());
   EXPECT_FALSE(result.error().IsSet());
   EXPECT_EQ(0, result.num_items_added());
   EXPECT_EQ(0, result.num_items_modified());
   EXPECT_EQ(0, result.num_items_deleted());
   EXPECT_EQ(0, result.num_items_before_association());
   EXPECT_EQ(0, result.num_items_after_association());
 
   EXPECT_EQ(0u, installer_->registered_whitelists().size());
 }
 
@@ skipping 23 matching lines @@
   // modified (whitelist B), and one item should be removed (whitelist A).
   syncer::SyncDataList initial_data;
   initial_data.push_back(
       SupervisedUserWhitelistService::CreateWhitelistSyncData(
           "bbbb", "Whitelist B New"));
   initial_data.push_back(
       SupervisedUserWhitelistService::CreateWhitelistSyncData(
           "cccc", "Whitelist C"));
   syncer::SyncMergeResult result = service_->MergeDataAndStartSyncing(
       syncer::SUPERVISED_USER_WHITELISTS, initial_data,
-      scoped_ptr<syncer::SyncChangeProcessor>(),
-      scoped_ptr<syncer::SyncErrorFactory>());
+      std::unique_ptr<syncer::SyncChangeProcessor>(),
+      std::unique_ptr<syncer::SyncErrorFactory>());
   EXPECT_FALSE(result.error().IsSet());
   EXPECT_EQ(1, result.num_items_added());
   EXPECT_EQ(1, result.num_items_modified());
   EXPECT_EQ(1, result.num_items_deleted());
   EXPECT_EQ(2, result.num_items_before_association());
   EXPECT_EQ(2, result.num_items_after_association());
 
   // Whitelist A (which was previously ready) should be removed now, and
   // whitelist B was never ready.
   EXPECT_EQ(0u, site_lists_.size());
@@ skipping 41 matching lines @@
       service_->GetAllSyncData(syncer::SUPERVISED_USER_WHITELISTS);
   ASSERT_EQ(2u, sync_data.size());
   const sync_pb::ManagedUserWhitelistSpecifics* whitelist =
       FindWhitelist(sync_data, "aaaa");
   ASSERT_TRUE(whitelist);
   EXPECT_EQ("Whitelist A", whitelist->name());
   whitelist = FindWhitelist(sync_data, "bbbb");
   ASSERT_TRUE(whitelist);
   EXPECT_EQ("Whitelist B", whitelist->name());
 }