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

chrome/common/extensions/manifest_handlers/settings_overrides_handler.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 "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 
+#include <utility>
+
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
@@ skipping 10 matching lines @@
 namespace extensions {
 namespace {
 
 const char kWwwPrefix[] = "www.";
 
 scoped_ptr<GURL> CreateManifestURL(const std::string& url) {
   scoped_ptr<GURL> manifest_url(new GURL(url));
   if (!manifest_url->is_valid() ||
       !manifest_url->SchemeIsHTTPOrHTTPS())
     return scoped_ptr<GURL>();
-  return manifest_url.Pass();
+  return manifest_url;
 }
 
 scoped_ptr<GURL> ParseHomepage(const ChromeSettingsOverrides& overrides,
                                base::string16* error) {
   if (!overrides.homepage)
     return scoped_ptr<GURL>();
   scoped_ptr<GURL> manifest_url = CreateManifestURL(*overrides.homepage);
   if (!manifest_url) {
     *error = extensions::ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidHomepageOverrideURL, *overrides.homepage);
   }
-  return manifest_url.Pass();
+  return manifest_url;
 }
 
 std::vector<GURL> ParseStartupPage(const ChromeSettingsOverrides& overrides,
                                    base::string16* error) {
   std::vector<GURL> urls;
   if (!overrides.startup_pages)
     return urls;
 
   for (std::vector<std::string>::const_iterator i =
        overrides.startup_pages->begin(); i != overrides.startup_pages->end();
@@ skipping 15 matching lines @@
     base::string16* error) {
   if (!overrides->search_provider)
     return scoped_ptr<ChromeSettingsOverrides::Search_provider>();
   if (!CreateManifestURL(overrides->search_provider->search_url)) {
     *error = extensions::ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidSearchEngineURL,
         overrides->search_provider->search_url);
     return scoped_ptr<ChromeSettingsOverrides::Search_provider>();
   }
   if (overrides->search_provider->prepopulated_id)
-    return overrides->search_provider.Pass();
+    return std::move(overrides->search_provider);
   if (!overrides->search_provider->name ||
       !overrides->search_provider->keyword ||
       !overrides->search_provider->encoding ||
       !overrides->search_provider->favicon_url) {
     *error =
         base::ASCIIToUTF16(manifest_errors::kInvalidSearchEngineMissingKeys);
     return scoped_ptr<ChromeSettingsOverrides::Search_provider>();
   }
   if (!CreateManifestURL(*overrides->search_provider->favicon_url)) {
     *error = extensions::ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidSearchEngineURL,
         *overrides->search_provider->favicon_url);
     return scoped_ptr<ChromeSettingsOverrides::Search_provider>();
   }
-  return overrides->search_provider.Pass();
+  return std::move(overrides->search_provider);
 }
 
 // A www. prefix is not informative and thus not worth the limited real estate
 // in the permissions UI.
 std::string RemoveWwwPrefix(const std::string& url) {
   if (base::StartsWith(url, kWwwPrefix, base::CompareCase::INSENSITIVE_ASCII))
     return url.substr(strlen(kWwwPrefix));
   return url;
 }
 
@@ skipping 65 matching lines @@
   extension->SetManifestData(manifest_keys::kSettingsOverride,
                              info.release());
   return true;
 }
 
 const std::vector<std::string> SettingsOverridesHandler::Keys() const {
   return SingleKey(manifest_keys::kSettingsOverride);
 }
 
 }  // namespace extensions