Add base:: to string16 in extensions/.

extensions/common/manifest_handlers/background_info.cc

Index: extensions/common/manifest_handlers/background_info.cc
diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc
index 1ec404eaea1826304979e4e594d0e4e8bcc0011d..66a18e576c886623a95087297870fae108f06696 100644
--- a/extensions/common/manifest_handlers/background_info.cc
+++ b/extensions/common/manifest_handlers/background_info.cc
@@ -93,7 +93,7 @@ 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) ||
@@ -107,7 +107,7 @@ bool BackgroundInfo::Parse(const Extension* extension, string16* error) {
 
 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;
@@ -135,7 +135,7 @@ bool BackgroundInfo::LoadBackgroundScripts(const Extension* extension,
 
 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;
@@ -180,7 +180,7 @@ bool BackgroundInfo::LoadBackgroundPage(const Extension* extension,
 }
 
 bool BackgroundInfo::LoadBackgroundPage(const Extension* extension,
-                                        string16* error) {
+                                        base::string16* error) {
   if (extension->is_platform_app()) {
     return LoadBackgroundPage(
         extension, keys::kPlatformAppBackgroundPage, error);
@@ -194,7 +194,7 @@ bool BackgroundInfo::LoadBackgroundPage(const Extension* extension,
 }
 
 bool BackgroundInfo::LoadBackgroundPersistent(const Extension* extension,
-                                              string16* error) {
+                                              base::string16* error) {
   if (extension->is_platform_app()) {
     is_persistent_ = false;
     return true;
@@ -219,7 +219,7 @@ bool BackgroundInfo::LoadBackgroundPersistent(const Extension* extension,
 }
 
 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))
@@ -240,7 +240,8 @@ 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;