Add explicit base namespace to string16 users.

chrome/common/extensions/manifest_handlers/content_scripts_handler.cc

Index: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
index 6e48e8203f74faed9795732fffae6c41804ac5c6..32d42f9d01e606b4d8e1c3408a028149162717c5 100644
--- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
+++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
@@ -36,7 +36,7 @@ namespace {
 bool LoadGlobsHelper(const base::DictionaryValue* content_script,
                      int content_script_index,
                      const char* globs_property_name,
-                     string16* error,
+                     base::string16* error,
                      void(UserScript::*add_method)(const std::string& glob),
                      UserScript* instance) {
   if (!content_script->HasKey(globs_property_name))
@@ -73,7 +73,7 @@ bool LoadGlobsHelper(const base::DictionaryValue* content_script,
 bool LoadUserScriptFromDictionary(const base::DictionaryValue* content_script,
                                   int definition_index,
                                   Extension* extension,
-                                  string16* error,
+                                  base::string16* error,
                                   UserScript* result) {
   // run_at
   if (content_script->HasKey(keys::kRunAt)) {
@@ -380,7 +380,7 @@ const std::vector<std::string> ContentScriptsHandler::Keys() const {
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
-bool ContentScriptsHandler::Parse(Extension* extension, string16* error) {
+bool ContentScriptsHandler::Parse(Extension* extension, base::string16* error) {
   scoped_ptr<ContentScriptsInfo> content_scripts_info(new ContentScriptsInfo);
   const base::ListValue* scripts_list = NULL;
   if (!extension->manifest()->GetList(keys::kContentScripts, &scripts_list)) {