Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1959)

Unified Diff: chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
index 5b9c84397bd13f9b354446d78d4de7d4e47a3333..e6492a7e9b53682a829715784cd0964070a65ad9 100644
--- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
+++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc
@@ -4,6 +4,8 @@
#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"
@@ -34,7 +36,7 @@ scoped_ptr<GURL> CreateManifestURL(const std::string& 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,
@@ -46,7 +48,7 @@ scoped_ptr<GURL> ParseHomepage(const ChromeSettingsOverrides& overrides,
*error = extensions::ErrorUtils::FormatErrorMessageUTF16(
manifest_errors::kInvalidHomepageOverrideURL, *overrides.homepage);
}
- return manifest_url.Pass();
+ return manifest_url;
}
std::vector<GURL> ParseStartupPage(const ChromeSettingsOverrides& overrides,
@@ -82,7 +84,7 @@ scoped_ptr<ChromeSettingsOverrides::Search_provider> ParseSearchEngine(
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 ||
@@ -97,7 +99,7 @@ scoped_ptr<ChromeSettingsOverrides::Search_provider> ParseSearchEngine(
*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

Powered by Google App Engine
This is Rietveld 408576698