Remove ScopedVector from chrome/browser/.

chrome/browser/supervised_user/supervised_user_service.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_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h"
@@ skipping 385 matching lines @@
   observer_list_.AddObserver(observer);
 }
 
 void SupervisedUserService::RemoveObserver(
     SupervisedUserServiceObserver* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void SupervisedUserService::AddPermissionRequestCreator(
     std::unique_ptr<PermissionRequestCreator> creator) {
-  permissions_creators_.push_back(creator.release());
+  permissions_creators_.push_back(std::move(creator));
 }
 
 void SupervisedUserService::SetSafeSearchURLReporter(
     std::unique_ptr<SafeSearchURLReporter> reporter) {
   url_reporter_ = std::move(reporter);
 }
 
 bool SupervisedUserService::IncludesSyncSessionsType() const {
   return includes_sync_sessions_type_;
 }
@@ skipping 133 matching lines @@
         InitSync(
             command_line->GetSwitchValueASCII(
                 switches::kSupervisedUserSyncToken));
       }
 
       ProfileOAuth2TokenService* token_service =
           ProfileOAuth2TokenServiceFactory::GetForProfile(profile_);
       token_service->LoadCredentials(
           supervised_users::kSupervisedUserPseudoEmail);
 
-      permissions_creators_.push_back(new PermissionRequestCreatorSync(
-          GetSettingsService(),
-          SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
-              profile_),
-          ProfileSyncServiceFactory::GetForProfile(profile_),
-          GetSupervisedUserName(),
-          profile_->GetPrefs()->GetString(prefs::kSupervisedUserId)));
+      permissions_creators_.push_back(
+          base::MakeUnique<PermissionRequestCreatorSync>(
+              GetSettingsService(),
+              SupervisedUserSharedSettingsServiceFactory::GetForBrowserContext(
+                  profile_),
+              ProfileSyncServiceFactory::GetForProfile(profile_),
+              GetSupervisedUserName(),
+              profile_->GetPrefs()->GetString(prefs::kSupervisedUserId)));
 
       SetupSync();
 #else
       NOTREACHED();
 #endif
     }
   }
 
   // Now activate/deactivate anything not handled by the delegate yet.
 
@@ skipping 190 matching lines @@
     const SuccessCallback& callback,
     size_t index) {
   // Find a permission request creator that is enabled.
   size_t next_index = FindEnabledPermissionRequestCreator(index);
   if (next_index >= permissions_creators_.size()) {
     callback.Run(false);
     return;
   }
 
   create_request.Run(
-      permissions_creators_[next_index],
+      permissions_creators_[next_index].get(),
       base::Bind(&SupervisedUserService::OnPermissionRequestIssued,
-                 weak_ptr_factory_.GetWeakPtr(), create_request,
-                 callback, next_index));
+                 weak_ptr_factory_.GetWeakPtr(), create_request, callback,
+                 next_index));
 }
 
 void SupervisedUserService::OnPermissionRequestIssued(
     const CreatePermissionRequestCallback& create_request,
     const SuccessCallback& callback,
     size_t index,
     bool success) {
   if (success) {
     callback.Run(true);
     return;
@@ skipping 507 matching lines @@
     content::RecordAction(UserMetricsAction("ManagedUsers_SwitchProfile"));
 
   is_profile_active_ = profile_became_active;
 }
 #endif  // !defined(OS_ANDROID)
 
 void SupervisedUserService::OnSiteListUpdated() {
   for (SupervisedUserServiceObserver& observer : observer_list_)
     observer.OnURLFilterChanged();
 }