Add base:: to string16s in android_webview/.

android_webview/renderer/aw_render_view_ext.cc

 // Copyright (c) 2012 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 "android_webview/renderer/aw_render_view_ext.h"
 
 #include <string>
 
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/common/render_view_messages.h"
@@ skipping 19 matching lines @@
 #include "third_party/WebKit/public/web/WebNodeList.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "url/url_canon.h"
 #include "url/url_util.h"
 
 namespace android_webview {
 
 namespace {
 
-GURL GetAbsoluteUrl(const blink::WebNode& node, const string16& url_fragment) {
+GURL GetAbsoluteUrl(const blink::WebNode& node,
+                    const base::string16& url_fragment) {
   return GURL(node.document().completeURL(url_fragment));
 }
 
-string16 GetHref(const blink::WebElement& element) {
+base::string16 GetHref(const blink::WebElement& element) {
   // Get the actual 'href' attribute, which might relative if valid or can
   // possibly contain garbage otherwise, so not using absoluteLinkURL here.
   return element.getAttribute("href");
 }
 
 GURL GetAbsoluteSrcUrl(const blink::WebElement& element) {
   if (element.isNull())
     return GURL();
   return GetAbsoluteUrl(element, element.getAttribute("src"));
 }
@@ skipping 11 matching lines @@
 bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix,
                                     const GURL& url,
                                     std::string* dest) {
   const base::StringPiece spec(url.possibly_invalid_spec());
 
   if (spec.starts_with(prefix)) {
     url_canon::RawCanonOutputW<1024> output;
     url_util::DecodeURLEscapeSequences(spec.data() + prefix.length(),
         spec.length() - prefix.length(), &output);
     std::string decoded_url = UTF16ToUTF8(
-        string16(output.data(), output.length()));
+        base::string16(output.data(), output.length()));
     dest->assign(decoded_url.begin(), decoded_url.end());
     return true;
   }
   return false;
 }
 
 void DistinguishAndAssignSrcLinkType(const GURL& url, AwHitTestData* data) {
   if (RemovePrefixAndAssignIfMatches(
       content::kAddressPrefix,
       url,
@@ skipping 235 matching lines @@
   render_view()->GetWebView()->setFixedLayoutSize(size);
 }
 
 void AwRenderViewExt::OnSetBackgroundColor(SkColor c) {
   if (!render_view() || !render_view()->GetWebView())
     return;
   render_view()->GetWebView()->setBaseBackgroundColor(c);
 }
 
 }  // namespace android_webview