Update uses of UTF conversions in chrome/common to use the base:: namespace.

chrome/common/extensions/manifest_url_handler.cc

 // Copyright (c) 2012 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_url_handler.h"
 
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
@@ skipping 102 matching lines @@
 DevToolsPageHandler::DevToolsPageHandler() {
 }
 
 DevToolsPageHandler::~DevToolsPageHandler() {
 }
 
 bool DevToolsPageHandler::Parse(Extension* extension, base::string16* error) {
   scoped_ptr<ManifestURL> manifest_url(new ManifestURL);
   std::string devtools_str;
   if (!extension->manifest()->GetString(keys::kDevToolsPage, &devtools_str)) {
-    *error = ASCIIToUTF16(errors::kInvalidDevToolsPage);
+    *error = base::ASCIIToUTF16(errors::kInvalidDevToolsPage);
     return false;
   }
   manifest_url->url_ = extension->GetResourceURL(devtools_str);
   extension->SetManifestData(keys::kDevToolsPage, manifest_url.release());
   PermissionsData::GetInitialAPIPermissions(extension)->insert(
       APIPermission::kDevtools);
   return true;
 }
 
 const std::vector<std::string> DevToolsPageHandler::Keys() const {
@@ skipping 65 matching lines @@
 OptionsPageHandler::OptionsPageHandler() {
 }
 
 OptionsPageHandler::~OptionsPageHandler() {
 }
 
 bool OptionsPageHandler::Parse(Extension* extension, base::string16* error) {
   scoped_ptr<ManifestURL> manifest_url(new ManifestURL);
   std::string options_str;
   if (!extension->manifest()->GetString(keys::kOptionsPage, &options_str)) {
-    *error = ASCIIToUTF16(errors::kInvalidOptionsPage);
+    *error = base::ASCIIToUTF16(errors::kInvalidOptionsPage);
     return false;
   }
 
   if (extension->is_hosted_app()) {
     // hosted apps require an absolute URL.
     GURL options_url(options_str);
     if (!options_url.is_valid() ||
         !options_url.SchemeIsHTTPOrHTTPS()) {
-      *error = ASCIIToUTF16(errors::kInvalidOptionsPageInHostedApp);
+      *error = base::ASCIIToUTF16(errors::kInvalidOptionsPageInHostedApp);
       return false;
     }
     manifest_url->url_ = options_url;
   } else {
     GURL absolute(options_str);
     if (absolute.is_valid()) {
-      *error = ASCIIToUTF16(errors::kInvalidOptionsPageExpectUrlInPackage);
+      *error =
+          base::ASCIIToUTF16(errors::kInvalidOptionsPageExpectUrlInPackage);
       return false;
     }
     manifest_url->url_ = extension->GetResourceURL(options_str);
     if (!manifest_url->url_.is_valid()) {
-      *error = ASCIIToUTF16(errors::kInvalidOptionsPage);
+      *error = base::ASCIIToUTF16(errors::kInvalidOptionsPage);
       return false;
     }
   }
 
   extension->SetManifestData(keys::kOptionsPage, manifest_url.release());
   return true;
 }
 
 bool OptionsPageHandler::Validate(const Extension* extension,
                                   std::string* error,
@@ skipping 25 matching lines @@
 URLOverridesHandler::URLOverridesHandler() {
 }
 
 URLOverridesHandler::~URLOverridesHandler() {
 }
 
 bool URLOverridesHandler::Parse(Extension* extension, base::string16* error) {
   const base::DictionaryValue* overrides = NULL;
   if (!extension->manifest()->GetDictionary(keys::kChromeURLOverrides,
                                             &overrides)) {
-    *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
+    *error = base::ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
     return false;
   }
   scoped_ptr<URLOverrides> url_overrides(new URLOverrides);
   // Validate that the overrides are all strings
   for (base::DictionaryValue::Iterator iter(*overrides); !iter.IsAtEnd();
          iter.Advance()) {
     std::string page = iter.key();
     std::string val;
     // Restrict override pages to a list of supported URLs.
     bool is_override = (page != chrome::kChromeUINewTabHost &&
                         page != chrome::kChromeUIBookmarksHost &&
                         page != chrome::kChromeUIHistoryHost);
 #if defined(OS_CHROMEOS)
     is_override = (is_override &&
                    page != chrome::kChromeUIActivationMessageHost);
 #endif
 #if defined(OS_CHROMEOS)
     is_override = (is_override && page != keyboard::kKeyboardWebUIHost);
 #endif
 #if defined(ENABLE_ENHANCED_BOOKMARKS)
     is_override = (is_override &&
                    !(extension->location() == Manifest::COMPONENT &&
                      page ==  chrome::kChromeUIEnhancedBookmarksHost));
 #endif
 
     if (is_override || !iter.value().GetAsString(&val)) {
-      *error = ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
+      *error = base::ASCIIToUTF16(errors::kInvalidChromeURLOverrides);
       return false;
     }
     // Replace the entry with a fully qualified chrome-extension:// URL.
     url_overrides->chrome_url_overrides_[page] = extension->GetResourceURL(val);
 
     // For component extensions, add override URL to extent patterns.
     if (extension->is_legacy_packaged_app() &&
         extension->location() == Manifest::COMPONENT) {
       URLPattern pattern(URLPattern::SCHEME_CHROMEUI);
       std::string url = base::StringPrintf(kOverrideExtentUrlPatternFormat,
                                            page.c_str());
       if (pattern.Parse(url) != URLPattern::PARSE_SUCCESS) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
             errors::kInvalidURLPatternError, url);
         return false;
       }
       extension->AddWebExtentPattern(pattern);
     }
   }
 
   // An extension may override at most one page.
   if (overrides->size() > 1) {
-    *error = ASCIIToUTF16(errors::kMultipleOverrides);
+    *error = base::ASCIIToUTF16(errors::kMultipleOverrides);
     return false;
   }
   extension->SetManifestData(keys::kChromeURLOverrides,
                              url_overrides.release());
   return true;
 }
 
 const std::vector<std::string> URLOverridesHandler::Keys() const {
   return SingleKey(keys::kChromeURLOverrides);
 }
 
 }  // namespace extensions