Convert Pass()→std::move() in //chrome

chrome/browser/supervised_user/supervised_user_pref_store.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_pref_store.h"
 
+#include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/supervised_user/supervised_user_bookmarks_handler.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
@@ skipping 87 matching lines @@
 
 bool SupervisedUserPrefStore::IsInitializationComplete() const {
   return !!prefs_;
 }
 
 SupervisedUserPrefStore::~SupervisedUserPrefStore() {
 }
 
 void SupervisedUserPrefStore::OnNewSettingsAvailable(
     const base::DictionaryValue* settings) {
-  scoped_ptr<PrefValueMap> old_prefs = prefs_.Pass();
+  scoped_ptr<PrefValueMap> old_prefs = std::move(prefs_);
   prefs_.reset(new PrefValueMap);
   if (settings) {
     // Set hardcoded prefs and defaults.
     prefs_->SetBoolean(prefs::kAllowDeletingBrowserHistory, false);
     prefs_->SetInteger(prefs::kDefaultSupervisedUserFilteringBehavior,
                        SupervisedUserURLFilter::ALLOW);
     prefs_->SetBoolean(prefs::kForceGoogleSafeSearch, true);
     prefs_->SetBoolean(prefs::kForceYouTubeSafetyMode, true);
     prefs_->SetBoolean(prefs::kHideWebStoreIcon, true);
     prefs_->SetInteger(prefs::kIncognitoModeAvailability,
@@ skipping 16 matching lines @@
       prefs_->SetInteger(prefs::kIncognitoModeAvailability,
                          record_history ? IncognitoModePrefs::DISABLED
                                         : IncognitoModePrefs::ENABLED);
     }
 
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kEnableSupervisedUserManagedBookmarksFolder)) {
       // Reconstruct bookmarks from split settings.
       prefs_->SetValue(
           bookmarks::prefs::kSupervisedBookmarks,
-          SupervisedUserBookmarksHandler::BuildBookmarksTree(*settings).Pass());
+          SupervisedUserBookmarksHandler::BuildBookmarksTree(*settings));
     }
   }
 
   if (!old_prefs) {
     FOR_EACH_OBSERVER(Observer, observers_, OnInitializationCompleted(true));
     return;
   }
 
   std::vector<std::string> changed_prefs;
   prefs_->GetDifferingKeys(old_prefs.get(), &changed_prefs);
 
   // Send out change notifications.
   for (const std::string& pref : changed_prefs) {
     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(pref));
   }
 }
 
 // Callback to unsubscribe from the supervised user settings service.
 void SupervisedUserPrefStore::Observe(
     int type,
     const content::NotificationSource& src,
     const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
   user_settings_subscription_.reset();
 }