Add explicit base namespace to string16 users.

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 "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/common/extensions/permissions/settings_override_permission.h"
 #include "extensions/common/error_utils.h"
@@ skipping 12 matching lines @@
 
 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();
 }
 
 scoped_ptr<GURL> ParseHomepage(const ChromeSettingsOverrides& overrides,
-                               string16* error) {
+                               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();
 }
 
 std::vector<GURL> ParseStartupPage(const ChromeSettingsOverrides& overrides,
-                                   string16* error) {
+                                   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();
        ++i) {
     scoped_ptr<GURL> manifest_url = CreateManifestURL(*i);
     if (!manifest_url) {
       *error = extensions::ErrorUtils::FormatErrorMessageUTF16(
           manifest_errors::kInvalidStartupOverrideURL, *i);
     } else {
       urls.push_back(GURL());
       urls.back().Swap(manifest_url.get());
     }
   }
   return urls;
 }
 
 scoped_ptr<ChromeSettingsOverrides::Search_provider> ParseSearchEngine(
     ChromeSettingsOverrides* overrides,
-    string16* error) {
+    base::string16* error) {
   if (!overrides->search_provider)
     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>();
   }
   if (!CreateManifestURL(overrides->search_provider->search_url)) {
     *error = extensions::ErrorUtils::FormatErrorMessageUTF16(
@@ skipping 21 matching lines @@
 const SettingsOverrides* SettingsOverrides::Get(
     const Extension* extension) {
   return static_cast<SettingsOverrides*>(
       extension->GetManifestData(manifest_keys::kSettingsOverride));
 }
 
 SettingsOverridesHandler::SettingsOverridesHandler() {}
 
 SettingsOverridesHandler::~SettingsOverridesHandler() {}
 
-bool SettingsOverridesHandler::Parse(Extension* extension, string16* error) {
+bool SettingsOverridesHandler::Parse(Extension* extension,
+                                     base::string16* error) {
   const base::Value* dict = NULL;
   CHECK(extension->manifest()->Get(manifest_keys::kSettingsOverride, &dict));
   scoped_ptr<ChromeSettingsOverrides> settings(
       ChromeSettingsOverrides::FromValue(*dict, error));
   if (!settings)
     return false;
 
   scoped_ptr<SettingsOverrides> info(new SettingsOverrides);
   info->homepage = ParseHomepage(*settings, error);
   info->search_engine = ParseSearchEngine(settings.get(), error);
@@ skipping 26 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