Convert string16 to base::string16 in content.

content/browser/accessibility/browser_accessibility_android.cc

 // Copyright 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 "content/browser/accessibility/browser_accessibility_android.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 #include "content/common/accessibility_messages.h"
 #include "content/common/accessibility_node_data.h"
@@ skipping 22 matching lines @@
       role() == blink::WebAXRoleRootWebArea ||
       role() == blink::WebAXRoleWebArea) {
     return false;
   }
 
   // If it has a focusable child, we definitely can't leave out children.
   if (HasFocusableChild())
     return false;
 
   // Headings with text can drop their children.
-  string16 name = GetText();
+  base::string16 name = GetText();
   if (role() == blink::WebAXRoleHeading && !name.empty())
     return true;
 
   // Focusable nodes with text can drop their children.
   if (HasState(blink::WebAXStateFocusable) && !name.empty())
     return true;
 
   // Nodes with only static text as children can drop their children.
   if (HasOnlyStaticTextChildren())
     return true;
@@ skipping 107 matching lines @@
       class_name = "android.widget.ListView";
       break;
     default:
       class_name = "android.view.View";
       break;
   }
 
   return class_name;
 }
 
-string16 BrowserAccessibilityAndroid::GetText() const {
+base::string16 BrowserAccessibilityAndroid::GetText() const {
   if (IsIframe() ||
       role() == blink::WebAXRoleWebArea) {
-    return string16();
+    return base::string16();
   }
 
-  string16 description = GetString16Attribute(
+  base::string16 description = GetString16Attribute(
       AccessibilityNodeData::ATTR_DESCRIPTION);
-  string16 text;
+  base::string16 text;
   if (!name().empty())
     text = base::UTF8ToUTF16(name());
   else if (!description.empty())
     text = description;
   else if (!value().empty())
     text = base::UTF8ToUTF16(value());
 
   // This is called from PlatformIsLeaf, so don't call PlatformChildCount
   // from within this!
   if (text.empty() && HasOnlyStaticTextChildren()) {
@@ skipping 123 matching lines @@
   }
   size_t right = 0;
   while (right < old_len &&
          right < new_len &&
          old_value_[old_len - right - 1] == new_value_[new_len - right - 1]) {
     right++;
   }
   return (old_len - left - right);
 }
 
-string16 BrowserAccessibilityAndroid::GetTextChangeBeforeText() const {
+base::string16 BrowserAccessibilityAndroid::GetTextChangeBeforeText() const {
   return old_value_;
 }
 
 int BrowserAccessibilityAndroid::GetSelectionStart() const {
   int sel_start = 0;
   GetIntAttribute(AccessibilityNodeData::ATTR_TEXT_SEL_START, &sel_start);
   return sel_start;
 }
 
 int BrowserAccessibilityAndroid::GetSelectionEnd() const {
@@ skipping 24 matching lines @@
   // from within this!
   for (uint32 i = 0; i < child_count(); i++) {
     BrowserAccessibility* child = children()[i];
     if (child->role() != blink::WebAXRoleStaticText)
       return false;
   }
   return true;
 }
 
 bool BrowserAccessibilityAndroid::IsIframe() const {
-  string16 html_tag = GetString16Attribute(
+  base::string16 html_tag = GetString16Attribute(
       AccessibilityNodeData::ATTR_HTML_TAG);
   return html_tag == ASCIIToUTF16("iframe");
 }
 
 void BrowserAccessibilityAndroid::PostInitialize() {
   BrowserAccessibility::PostInitialize();
 
   if (IsEditableText()) {
     if (base::UTF8ToUTF16(value_) != new_value_) {
       old_value_ = new_value_;
       new_value_ = base::UTF8ToUTF16(value_);
     }
   }
 
   if (role_ == blink::WebAXRoleAlert && first_time_)
     manager_->NotifyAccessibilityEvent(blink::WebAXEventAlert, this);
 
-  string16 live;
+  base::string16 live;
   if (GetString16Attribute(
       AccessibilityNodeData::ATTR_CONTAINER_LIVE_STATUS, &live)) {
     NotifyLiveRegionUpdate(live);
   }
 
   first_time_ = false;
 }
 
-void BrowserAccessibilityAndroid::NotifyLiveRegionUpdate(string16& aria_live) {
+void BrowserAccessibilityAndroid::NotifyLiveRegionUpdate(
+    base::string16& aria_live) {
   if (!EqualsASCII(aria_live, aria_strings::kAriaLivePolite) &&
       !EqualsASCII(aria_live, aria_strings::kAriaLiveAssertive))
     return;
 
-  string16 text = GetText();
+  base::string16 text = GetText();
   if (cached_text_ != text) {
     if (!text.empty()) {
       manager_->NotifyAccessibilityEvent(blink::WebAXEventShow,
                                          this);
     }
     cached_text_ = text;
   }
 }
 
 }  // namespace content