Add base:: to string16s in android_webview/.

R=benm@chromium.org
BUG=329295

Review URL: https://codereview.chromium.org/100453010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241958 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 31 insertions, 29 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 0651bab..07eec21 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -119,7 +119,7 @@ class AwAccessTokenStore : public content::AccessTokenStore {
     request.Run(access_token_set, NULL);
   }
   virtual void SaveAccessToken(const GURL& server_url,
-                               const string16& access_token) OVERRIDE { }
+                               const base::string16& access_token) OVERRIDE { }
 
  private:
   virtual ~AwAccessTokenStore() { }
@@ -285,8 +285,8 @@ bool AwContentBrowserClient::AllowSetCookie(const GURL& url,
 
 bool AwContentBrowserClient::AllowWorkerDatabase(
     const GURL& url,
-    const string16& name,
-    const string16& display_name,
+    const base::string16& name,
+    const base::string16& display_name,
     unsigned long estimated_size,
     content::ResourceContext* context,
     const std::vector<std::pair<int, int> >& render_frames) {
@@ -304,7 +304,7 @@ bool AwContentBrowserClient::AllowWorkerFileSystem(
 
 bool AwContentBrowserClient::AllowWorkerIndexedDB(
     const GURL& url,
-    const string16& name,
+    const base::string16& name,
     content::ResourceContext* context,
     const std::vector<std::pair<int, int> >& render_frames) {
   // Android WebView does not yet support web workers.
diff --git a/android_webview/browser/aw_content_browser_client.h b/android_webview/browser/aw_content_browser_client.h
index 3f81eca..cc32a60 100644
--- a/android_webview/browser/aw_content_browser_client.h
+++ b/android_webview/browser/aw_content_browser_client.h
@@ -76,8 +76,8 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
                               net::CookieOptions* options) OVERRIDE;
   virtual bool AllowWorkerDatabase(
       const GURL& url,
-      const string16& name,
-      const string16& display_name,
+      const base::string16& name,
+      const base::string16& display_name,
       unsigned long estimated_size,
       content::ResourceContext* context,
       const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
@@ -87,7 +87,7 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
       const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
   virtual bool AllowWorkerIndexedDB(
       const GURL& url,
-      const string16& name,
+      const base::string16& name,
       content::ResourceContext* context,
       const std::vector<std::pair<int, int> >& render_frames) OVERRIDE;
   virtual content::QuotaPermissionContext*
diff --git a/android_webview/browser/aw_contents_client_bridge_base.h b/android_webview/browser/aw_contents_client_bridge_base.h
index 3166f6b..0383a37 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.h
+++ b/android_webview/browser/aw_contents_client_bridge_base.h
@@ -47,14 +47,14 @@ class AwContentsClientBridgeBase {
   virtual void RunJavaScriptDialog(
       content::JavaScriptMessageType message_type,
       const GURL& origin_url,
-      const string16& message_text,
-      const string16& default_prompt_text,
+      const base::string16& message_text,
+      const base::string16& default_prompt_text,
       const content::JavaScriptDialogManager::DialogClosedCallback& callback)
       = 0;
 
   virtual void RunBeforeUnloadDialog(
       const GURL& origin_url,
-      const string16& message_text,
+      const base::string16& message_text,
       const content::JavaScriptDialogManager::DialogClosedCallback& callback)
       = 0;
 
diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc
index 1690eac..630c7bf 100644
--- a/android_webview/browser/aw_javascript_dialog_manager.cc
+++ b/android_webview/browser/aw_javascript_dialog_manager.cc
@@ -19,8 +19,8 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
     const GURL& origin_url,
     const std::string& accept_lang,
     content::JavaScriptMessageType message_type,
-    const string16& message_text,
-    const string16& default_prompt_text,
+    const base::string16& message_text,
+    const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
   AwContentsClientBridgeBase* bridge =
@@ -34,7 +34,7 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
 
 void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
-    const string16& message_text,
+    const base::string16& message_text,
     bool is_reload,
     const DialogClosedCallback& callback) {
   AwContentsClientBridgeBase* bridge =
diff --git a/android_webview/browser/aw_javascript_dialog_manager.h b/android_webview/browser/aw_javascript_dialog_manager.h
index f8db746..e43932d 100644
--- a/android_webview/browser/aw_javascript_dialog_manager.h
+++ b/android_webview/browser/aw_javascript_dialog_manager.h
@@ -20,13 +20,13 @@ class AwJavaScriptDialogManager : public content::JavaScriptDialogManager {
       const GURL& origin_url,
       const std::string& accept_lang,
       content::JavaScriptMessageType message_type,
-      const string16& message_text,
-      const string16& default_prompt_text,
+      const base::string16& message_text,
+      const base::string16& default_prompt_text,
       const DialogClosedCallback& callback,
       bool* did_suppress_message) OVERRIDE;
   virtual void RunBeforeUnloadDialog(
       content::WebContents* web_contents,
-      const string16& message_text,
+      const base::string16& message_text,
       bool is_reload,
       const DialogClosedCallback& callback) OVERRIDE;
   virtual void CancelActiveAndPendingDialogs(
diff --git a/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc
index 2c73253..84ef2cb2 100644
--- a/android_webview/browser/aw_login_delegate.cc
+++ b/android_webview/browser/aw_login_delegate.cc
@@ -66,8 +66,8 @@ AwLoginDelegate::~AwLoginDelegate() {
   DCHECK(aw_http_auth_handler_ == NULL);
 }
 
-void AwLoginDelegate::Proceed(const string16& user,
-                              const string16& password) {
+void AwLoginDelegate::Proceed(const base::string16& user,
+                              const base::string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&AwLoginDelegate::ProceedOnIOThread,
@@ -112,8 +112,8 @@ void AwLoginDelegate::CancelOnIOThread() {
   DeleteAuthHandlerSoon();
 }
 
-void AwLoginDelegate::ProceedOnIOThread(const string16& user,
-                                        const string16& password) {
+void AwLoginDelegate::ProceedOnIOThread(const base::string16& user,
+                                        const base::string16& password) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (request_) {
     request_->SetAuth(net::AuthCredentials(user, password));
diff --git a/android_webview/browser/aw_login_delegate.h b/android_webview/browser/aw_login_delegate.h
index 2542f06..f0f8769 100644
--- a/android_webview/browser/aw_login_delegate.h
+++ b/android_webview/browser/aw_login_delegate.h
@@ -24,7 +24,8 @@ class AwLoginDelegate :
   AwLoginDelegate(net::AuthChallengeInfo* auth_info,
                   net::URLRequest* request);
 
-  virtual void Proceed(const string16& user, const string16& password);
+  virtual void Proceed(const base::string16& user,
+                       const base::string16& password);
   virtual void Cancel();
 
   // from ResourceDispatcherHostLoginDelegate
@@ -34,7 +35,8 @@ class AwLoginDelegate :
   virtual ~AwLoginDelegate();
   void HandleHttpAuthRequestOnUIThread(bool first_auth_attempt);
   void CancelOnIOThread();
-  void ProceedOnIOThread(const string16& user, const string16& password);
+  void ProceedOnIOThread(const base::string16& user,
+                         const base::string16& password);
   void DeleteAuthHandlerSoon();
 
   scoped_ptr<AwHttpAuthHandlerBase> aw_http_auth_handler_;
diff --git a/android_webview/browser/find_helper.cc b/android_webview/browser/find_helper.cc
index 15ae0ac..bf6f712 100644
--- a/android_webview/browser/find_helper.cc
+++ b/android_webview/browser/find_helper.cc
@@ -35,7 +35,7 @@ void FindHelper::SetListener(Listener* listener) {
   listener_ = listener;
 }
 
-void FindHelper::FindAllAsync(const string16& search_string) {
+void FindHelper::FindAllAsync(const base::string16& search_string) {
   // Stop any ongoing asynchronous request.
   web_contents()->GetRenderViewHost()->StopFinding(
       content::STOP_FIND_ACTION_KEEP_SELECTION);
@@ -90,7 +90,7 @@ void FindHelper::ClearMatches() {
   last_active_ordinal_ = -1;
 }
 
-void FindHelper::StartNewRequest(const string16& search_string) {
+void FindHelper::StartNewRequest(const base::string16& search_string) {
   current_request_id_ = find_request_id_counter_++;
   last_search_string_ = search_string;
   last_match_count_ = -1;
diff --git a/android_webview/browser/find_helper.h b/android_webview/browser/find_helper.h
index 7662ec5..eabf197 100644
--- a/android_webview/browser/find_helper.h
+++ b/android_webview/browser/find_helper.h
@@ -32,7 +32,7 @@ class FindHelper : public content::WebContentsObserver {
   void SetListener(Listener* listener);
 
   // Asynchronous API.
-  void FindAllAsync(const string16& search_string);
+  void FindAllAsync(const base::string16& search_string);
   void HandleFindReply(int request_id,
                        int match_count,
                        int active_ordinal,
@@ -43,7 +43,7 @@ class FindHelper : public content::WebContentsObserver {
   void ClearMatches();
 
  private:
-  void StartNewRequest(const string16& search_string);
+  void StartNewRequest(const base::string16& search_string);
   void NotifyResults(int active_ordinal, int match_count, bool finished);
 
   // Listener results are reported to.
@@ -59,7 +59,7 @@ class FindHelper : public content::WebContentsObserver {
   int current_request_id_;
 
   // Required by FindNext and the incremental find replies.
-  string16 last_search_string_;
+  base::string16 last_search_string_;
   int last_match_count_;
   int last_active_ordinal_;
 
diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc
index b9059b8c..1dd525d 100644
--- a/android_webview/browser/net/aw_network_delegate.cc
+++ b/android_webview/browser/net/aw_network_delegate.cc
@@ -67,7 +67,7 @@ void AwNetworkDelegate::OnURLRequestDestroyed(net::URLRequest* request) {
 }
 
 void AwNetworkDelegate::OnPACScriptError(int line_number,
-                                         const string16& error) {
+                                         const base::string16& error) {
 }
 
 net::NetworkDelegate::AuthRequiredResponse AwNetworkDelegate::OnAuthRequired(
diff --git a/android_webview/browser/net/aw_network_delegate.h b/android_webview/browser/net/aw_network_delegate.h
index de1af58..e9756dc 100644
--- a/android_webview/browser/net/aw_network_delegate.h
+++ b/android_webview/browser/net/aw_network_delegate.h
@@ -40,7 +40,7 @@ class AwNetworkDelegate : public net::NetworkDelegate {
   virtual void OnCompleted(net::URLRequest* request, bool started) OVERRIDE;
   virtual void OnURLRequestDestroyed(net::URLRequest* request) OVERRIDE;
   virtual void OnPACScriptError(int line_number,
-                                const string16& error) OVERRIDE;
+                                const base::string16& error) OVERRIDE;
   virtual net::NetworkDelegate::AuthRequiredResponse OnAuthRequired(
       net::URLRequest* request,
       const net::AuthChallengeInfo& auth_info,