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

chrome/browser/extensions/api/settings_private/prefs_util.cc

 // Copyright 2015 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/extensions/api/settings_private/prefs_util.h"
 
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ skipping 238 matching lines @@
       new settings_private::PrefObject());
 
 #if defined(OS_CHROMEOS)
   const base::Value* value = CrosSettings::Get()->GetPref(name);
   DCHECK(value);
   pref_object->key = name;
   pref_object->type = GetType(name, value->GetType());
   pref_object->value.reset(value->DeepCopy());
 #endif
 
-  return pref_object.Pass();
+  return pref_object;
 }
 
 scoped_ptr<settings_private::PrefObject> PrefsUtil::GetPref(
     const std::string& name) {
   const PrefService::Preference* pref = nullptr;
   scoped_ptr<settings_private::PrefObject> pref_object;
   if (IsCrosSetting(name)) {
     pref_object = GetCrosSettingsPref(name);
   } else {
     PrefService* pref_service = FindServiceForPref(name);
@@ skipping 25 matching lines @@
         settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;
     return pref_object.Pass();
   }
 #endif
 
   if (pref && pref->IsManaged()) {
     pref_object->policy_source =
         settings_private::PolicySource::POLICY_SOURCE_USER_POLICY;
     pref_object->policy_enforcement =
         settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;
-    return pref_object.Pass();
+    return pref_object;
   }
   if (pref && pref->IsRecommended()) {
     pref_object->policy_source =
         settings_private::PolicySource::POLICY_SOURCE_USER_POLICY;
     pref_object->policy_enforcement =
         settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_RECOMMENDED;
     pref_object->recommended_value.reset(
         pref->GetRecommendedValue()->DeepCopy());
-    return pref_object.Pass();
+    return pref_object;
   }
 
 #if defined(OS_CHROMEOS)
   if (IsPrefOwnerControlled(name)) {
     // Check for owner controlled after managed checks because if there is a
     // device policy there is no "owner". (In the unlikely case that both
     // situations apply, either badge is potentially relevant, so the order
     // is somewhat arbitrary).
     pref_object->policy_source =
         settings_private::PolicySource::POLICY_SOURCE_OWNER;
@@ skipping 11 matching lines @@
             ->GetExtensionControllingPref(pref->name());
     const Extension* extension = ExtensionRegistry::Get(profile_)->
         GetExtensionById(extension_id, ExtensionRegistry::ENABLED);
     if (extension) {
       pref_object->policy_source =
           settings_private::PolicySource::POLICY_SOURCE_EXTENSION;
       pref_object->policy_enforcement =
           settings_private::PolicyEnforcement::POLICY_ENFORCEMENT_ENFORCED;
       pref_object->extension_id.reset(new std::string(extension_id));
       pref_object->policy_source_name.reset(new std::string(extension->name()));
-      return pref_object.Pass();
+      return pref_object;
     }
   }
   if (pref && (!pref->IsUserModifiable() || IsPrefSupervisorControlled(name))) {
     // TODO(stevenjb): Investigate whether either of these should be badged.
     pref_object->read_only.reset(new bool(true));
-    return pref_object.Pass();
+    return pref_object;
   }
 
-  return pref_object.Pass();
+  return pref_object;
 }
 
 PrefsUtil::SetPrefResult PrefsUtil::SetPref(const std::string& pref_name,
                                             const base::Value* value) {
   if (IsCrosSetting(pref_name))
     return SetCrosSettingsPref(pref_name, value);
 
   PrefService* pref_service = FindServiceForPref(pref_name);
 
   if (!IsPrefUserModifiable(pref_name))
@@ skipping 193 matching lines @@
 
 bool PrefsUtil::IsCrosSetting(const std::string& pref_name) {
 #if defined(OS_CHROMEOS)
   return CrosSettings::Get()->IsCrosSettings(pref_name);
 #else
   return false;
 #endif
 }
 
 }  // namespace extensions