Add base:: to string16 in extensions/.

extensions/common/permissions/permissions_data.cc

 // Copyright (c) 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/permissions/permissions_data.h"
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 77 matching lines @@
   // Otherwise, the valid schemes were handled by URLPattern.
   return true;
 }
 
 // Parses the host and api permissions from the specified permission |key|
 // from |extension|'s manifest.
 bool ParseHelper(Extension* extension,
                  const char* key,
                  APIPermissionSet* api_permissions,
                  URLPatternSet* host_permissions,
-                 string16* error) {
+                 base::string16* error) {
   if (!extension->manifest()->HasKey(key))
     return true;
 
   const base::ListValue* permissions = NULL;
   if (!extension->manifest()->GetList(key, &permissions)) {
     *error = ErrorUtils::FormatErrorMessageUTF16(errors::kInvalidPermissions,
                                                  std::string());
     return false;
   }
 
@@ skipping 313 matching lines @@
   base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
   if (ShouldSkipPermissionWarnings(extension)) {
     return PermissionMessages();
   } else {
     return PermissionMessageProvider::Get()->GetPermissionMessages(
         GetActivePermissions(extension), extension->GetType());
   }
 }
 
 // static
-std::vector<string16> PermissionsData::GetPermissionMessageStrings(
+std::vector<base::string16> PermissionsData::GetPermissionMessageStrings(
     const Extension* extension) {
   base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
   if (ShouldSkipPermissionWarnings(extension)) {
-    return std::vector<string16>();
+    return std::vector<base::string16>();
   } else {
     return PermissionMessageProvider::Get()->GetWarningMessages(
         GetActivePermissions(extension), extension->GetType());
   }
 }
 
 // static
-std::vector<string16> PermissionsData::GetPermissionMessageDetailsStrings(
+std::vector<base::string16> PermissionsData::GetPermissionMessageDetailsStrings(
     const Extension* extension) {
   base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
   if (ShouldSkipPermissionWarnings(extension)) {
-    return std::vector<string16>();
+    return std::vector<base::string16>();
   } else {
     return PermissionMessageProvider::Get()->GetWarningMessagesDetails(
         GetActivePermissions(extension), extension->GetType());
   }
 }
 
 // static
 bool PermissionsData::CanExecuteScriptOnPage(const Extension* extension,
                                              const GURL& document_url,
                                              const GURL& top_frame_url,
@@ skipping 95 matching lines @@
     return true;
   }
 
   if (error) {
     *error = ErrorUtils::FormatErrorMessage(errors::kCannotAccessPage,
                                             page_url.spec());
   }
   return false;
 }
 
-bool PermissionsData::ParsePermissions(Extension* extension, string16* error) {
+bool PermissionsData::ParsePermissions(Extension* extension,
+                                       base::string16* error) {
   initial_required_permissions_.reset(new InitialPermissions);
   if (!ParseHelper(extension,
                    keys::kPermissions,
                    &initial_required_permissions_->api_permissions,
                    &initial_required_permissions_->host_permissions,
                    error)) {
     return false;
   }
 
   // TODO(jeremya/kalman) do this via the features system by exposing the
@@ skipping 42 matching lines @@
       initial_optional_permissions_->api_permissions,
       initial_optional_permissions_->manifest_permissions,
       initial_optional_permissions_->host_permissions,
       URLPatternSet());
 
   initial_required_permissions_.reset();
   initial_optional_permissions_.reset();
 }
 
 }  // namespace extensions