Add base:: to string16 in extensions/.

extensions/common/manifest_handlers/background_info.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 "extensions/common/manifest_handlers/background_info.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 75 matching lines @@
 // static
 bool BackgroundInfo::HasPersistentBackgroundPage(const Extension* extension)  {
   return GetBackgroundInfo(extension).has_persistent_background_page();
 }
 
 // static
 bool BackgroundInfo::HasLazyBackgroundPage(const Extension* extension) {
   return GetBackgroundInfo(extension).has_lazy_background_page();
 }
 
-bool BackgroundInfo::Parse(const Extension* extension, string16* error) {
+bool BackgroundInfo::Parse(const Extension* extension, base::string16* error) {
   const std::string& bg_scripts_key = extension->is_platform_app() ?
       keys::kPlatformAppBackgroundScripts : keys::kBackgroundScripts;
   if (!LoadBackgroundScripts(extension, bg_scripts_key, error) ||
       !LoadBackgroundPage(extension, error) ||
       !LoadBackgroundPersistent(extension, error) ||
       !LoadAllowJSAccess(extension, error)) {
     return false;
   }
   return true;
 }
 
 bool BackgroundInfo::LoadBackgroundScripts(const Extension* extension,
                                            const std::string& key,
-                                           string16* error) {
+                                           base::string16* error) {
   const base::Value* background_scripts_value = NULL;
   if (!extension->manifest()->Get(key, &background_scripts_value))
     return true;
 
   CHECK(background_scripts_value);
   if (background_scripts_value->GetType() != base::Value::TYPE_LIST) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundScripts);
     return false;
   }
 
   const base::ListValue* background_scripts = NULL;
   background_scripts_value->GetAsList(&background_scripts);
   for (size_t i = 0; i < background_scripts->GetSize(); ++i) {
     std::string script;
     if (!background_scripts->GetString(i, &script)) {
       *error = ErrorUtils::FormatErrorMessageUTF16(
           errors::kInvalidBackgroundScript, base::IntToString(i));
       return false;
     }
     background_scripts_.push_back(script);
   }
 
   return true;
 }
 
 bool BackgroundInfo::LoadBackgroundPage(const Extension* extension,
                                         const std::string& key,
-                                        string16* error) {
+                                        base::string16* error) {
   const base::Value* background_page_value = NULL;
   if (!extension->manifest()->Get(key, &background_page_value))
     return true;
 
   if (!background_scripts_.empty()) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundCombination);
     return false;
   }
 
   std::string background_str;
@@ skipping 24 matching lines @@
       return false;
     }
   } else {
     background_url_ = extension->GetResourceURL(background_str);
   }
 
   return true;
 }
 
 bool BackgroundInfo::LoadBackgroundPage(const Extension* extension,
-                                        string16* error) {
+                                        base::string16* error) {
   if (extension->is_platform_app()) {
     return LoadBackgroundPage(
         extension, keys::kPlatformAppBackgroundPage, error);
   }
 
   if (!LoadBackgroundPage(extension, keys::kBackgroundPage, error))
     return false;
   if (background_url_.is_empty())
     return LoadBackgroundPage(extension, keys::kBackgroundPageLegacy, error);
   return true;
 }
 
 bool BackgroundInfo::LoadBackgroundPersistent(const Extension* extension,
-                                              string16* error) {
+                                              base::string16* error) {
   if (extension->is_platform_app()) {
     is_persistent_ = false;
     return true;
   }
 
   const base::Value* background_persistent = NULL;
   if (!extension->manifest()->Get(keys::kBackgroundPersistent,
                                   &background_persistent))
     return true;
 
   if (!background_persistent->GetAsBoolean(&is_persistent_)) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistent);
     return false;
   }
 
   if (!has_background_page()) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistentNoPage);
     return false;
   }
 
   return true;
 }
 
 bool BackgroundInfo::LoadAllowJSAccess(const Extension* extension,
-                                       string16* error) {
+                                       base::string16* error) {
   const base::Value* allow_js_access = NULL;
   if (!extension->manifest()->Get(keys::kBackgroundAllowJsAccess,
                                   &allow_js_access))
     return true;
 
   if (!allow_js_access->IsType(base::Value::TYPE_BOOLEAN) ||
       !allow_js_access->GetAsBoolean(&allow_js_access_)) {
     *error = ASCIIToUTF16(errors::kInvalidBackgroundAllowJsAccess);
     return false;
   }
 
   return true;
 }
 
 BackgroundManifestHandler::BackgroundManifestHandler() {
 }
 
 BackgroundManifestHandler::~BackgroundManifestHandler() {
 }
 
-bool BackgroundManifestHandler::Parse(Extension* extension, string16* error) {
+bool BackgroundManifestHandler::Parse(Extension* extension,
+                                      base::string16* error) {
   scoped_ptr<BackgroundInfo> info(new BackgroundInfo);
   if (!info->Parse(extension, error))
     return false;
 
   // Platform apps must have background pages.
   if (extension->is_platform_app() && !info->has_background_page()) {
     *error = ASCIIToUTF16(errors::kBackgroundRequiredForPlatformApps);
     return false;
   }
   // Lazy background pages are incompatible with the webRequest API.
@@ skipping 55 matching lines @@
     keys::kBackgroundPageLegacy,
     keys::kBackgroundPersistent,
     keys::kBackgroundScripts,
     keys::kPlatformAppBackgroundPage,
     keys::kPlatformAppBackgroundScripts
   };
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
 }  // namespace extensions