Convert string16 to base::string16 in content.

content/browser/accessibility/browser_accessibility.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_
 
 #include <map>
 #include <utility>
 #include <vector>
@@ skipping 174 matching lines @@
   // but only a few tend to apply to any one object, so we store them
   // in sparse arrays of <attribute id, attribute value> pairs, organized
   // by type (bool, int, float, string, int list).
   //
   // There are three accessors for each type of attribute: one that returns
   // true if the attribute is present and false if not, one that takes a
   // pointer argument and returns true if the attribute is present (if you
   // need to distinguish between the default value and a missing attribute),
   // and another that returns the default value for that type if the
   // attribute is not present. In addition, strings can be returned as
-  // either std::string or string16, for convenience.
+  // either std::string or base::string16, for convenience.
 
   bool HasBoolAttribute(AccessibilityNodeData::BoolAttribute attr) const;
   bool GetBoolAttribute(AccessibilityNodeData::BoolAttribute attr) const;
   bool GetBoolAttribute(AccessibilityNodeData::BoolAttribute attr,
                         bool* value) const;
 
   bool HasFloatAttribute(AccessibilityNodeData::FloatAttribute attr) const;
   float GetFloatAttribute(AccessibilityNodeData::FloatAttribute attr) const;
   bool GetFloatAttribute(AccessibilityNodeData::FloatAttribute attr,
                          float* value) const;
 
   bool HasIntAttribute(AccessibilityNodeData::IntAttribute attribute) const;
   int GetIntAttribute(AccessibilityNodeData::IntAttribute attribute) const;
   bool GetIntAttribute(AccessibilityNodeData::IntAttribute attribute,
                        int* value) const;
 
   bool HasStringAttribute(
       AccessibilityNodeData::StringAttribute attribute) const;
   const std::string& GetStringAttribute(
       AccessibilityNodeData::StringAttribute attribute) const;
   bool GetStringAttribute(AccessibilityNodeData::StringAttribute attribute,
                           std::string* value) const;
 
   bool GetString16Attribute(AccessibilityNodeData::StringAttribute attribute,
-                            string16* value) const;
-  string16 GetString16Attribute(
+                            base::string16* value) const;
+  base::string16 GetString16Attribute(
       AccessibilityNodeData::StringAttribute attribute) const;
 
   bool HasIntListAttribute(
       AccessibilityNodeData::IntListAttribute attribute) const;
   const std::vector<int32>& GetIntListAttribute(
       AccessibilityNodeData::IntListAttribute attribute) const;
   bool GetIntListAttribute(AccessibilityNodeData::IntListAttribute attribute,
                            std::vector<int32>* value) const;
 
   void SetStringAttribute(
       AccessibilityNodeData::StringAttribute attribute,
       const std::string& value);
 
   // Retrieve the value of a html attribute from the attribute map and
   // returns true if found.
-  bool GetHtmlAttribute(const char* attr, string16* value) const;
+  bool GetHtmlAttribute(const char* attr, base::string16* value) const;
   bool GetHtmlAttribute(const char* attr, std::string* value) const;
 
   // Utility method to handle special cases for ARIA booleans, tristates and
   // booleans which have a "mixed" state.
   //
   // Warning: the term "Tristate" is used loosely by the spec and here,
   // as some attributes support a 4th state.
   //
   // The following attributes are appropriate to use with this method:
   // aria-selected  (selectable)
@@ skipping 65 matching lines @@
   // immediately return failure.
   bool instance_active_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserAccessibility);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_H_