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

6 files changed, 9 insertions, 9 deletions

diff --git a/android_webview/common/aw_content_client.cc b/android_webview/common/aw_content_client.cc
index 30ef6c2..e91faa9 100644
--- a/android_webview/common/aw_content_client.cc
+++ b/android_webview/common/aw_content_client.cc
@@ -31,7 +31,7 @@ std::string AwContentClient::GetUserAgent() const {
   return webkit_glue::BuildUserAgentFromProduct(product);
 }
 
-string16 AwContentClient::GetLocalizedString(int message_id) const {
+base::string16 AwContentClient::GetLocalizedString(int message_id) const {
   // TODO(boliu): Used only by WebKit, so only bundle those resources for
   // Android WebView.
   return l10n_util::GetStringUTF16(message_id);
diff --git a/android_webview/common/aw_content_client.h b/android_webview/common/aw_content_client.h
index 35ae7cb..b764944 100644
--- a/android_webview/common/aw_content_client.h
+++ b/android_webview/common/aw_content_client.h
@@ -16,7 +16,7 @@ class AwContentClient : public content::ContentClient {
   // ContentClient implementation.
   virtual std::string GetProduct() const OVERRIDE;
   virtual std::string GetUserAgent() const OVERRIDE;
-  virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
+  virtual base::string16 GetLocalizedString(int message_id) const OVERRIDE;
   virtual base::StringPiece GetDataResource(
       int resource_id,
       ui::ScaleFactor scale_factor) const OVERRIDE;
diff --git a/android_webview/common/aw_hit_test_data.h b/android_webview/common/aw_hit_test_data.h
index ee600f5..8e5919b 100644
--- a/android_webview/common/aw_hit_test_data.h
+++ b/android_webview/common/aw_hit_test_data.h
@@ -66,8 +66,8 @@ struct AwHitTestData {
   // Java.
   int type;  // Only values from enum Type above.
   std::string extra_data_for_type;
-  string16 href;
-  string16 anchor_text;
+  base::string16 href;
+  base::string16 anchor_text;
   GURL img_src;
 
   AwHitTestData();
diff --git a/android_webview/common/print_messages.cc b/android_webview/common/print_messages.cc
index a870498..f7d3597 100644
--- a/android_webview/common/print_messages.cc
+++ b/android_webview/common/print_messages.cc
@@ -55,8 +55,8 @@ void PrintMsg_Print_Params::Reset() {
   print_scaling_option = blink::WebPrintScalingOptionSourceSize;
   print_to_pdf = false;
   display_header_footer = false;
-  title = string16();
-  url = string16();
+  title = base::string16();
+  url = base::string16();
   should_print_backgrounds = false;
 }
 
diff --git a/android_webview/common/print_messages.h b/android_webview/common/print_messages.h
index 436bc96..241be60 100644
--- a/android_webview/common/print_messages.h
+++ b/android_webview/common/print_messages.h
@@ -47,8 +47,8 @@ struct PrintMsg_Print_Params {
   blink::WebPrintScalingOption print_scaling_option;
   bool print_to_pdf;
   bool display_header_footer;
-  string16 title;
-  string16 url;
+  base::string16 title;
+  base::string16 url;
   bool should_print_backgrounds;
 };
 
diff --git a/android_webview/common/render_view_messages.h b/android_webview/common/render_view_messages.h
index f9a27af..163d9c9 100644
--- a/android_webview/common/render_view_messages.h
+++ b/android_webview/common/render_view_messages.h
@@ -108,5 +108,5 @@ IPC_MESSAGE_ROUTED1(AwViewHostMsg_OnContentsSizeChanged,
 // or creating a URLRequest for the main frame resource.
 IPC_SYNC_MESSAGE_CONTROL2_1(AwViewHostMsg_ShouldOverrideUrlLoading,
                             int /* routing id */,
-                            string16 /* in - url */,
+                            base::string16 /* in - url */,
                             bool /* out - result */)