Convert string16 to base::string16 in content.

content/browser/accessibility/accessibility_tree_formatter_win.cc

Index: content/browser/accessibility/accessibility_tree_formatter_win.cc
diff --git a/content/browser/accessibility/accessibility_tree_formatter_win.cc b/content/browser/accessibility/accessibility_tree_formatter_win.cc
index 679843dc42ec061a6c51d8818c84bc4075490914..c50b52630d947fc79875761c5438e41628f6c2ce 100644
--- a/content/browser/accessibility/accessibility_tree_formatter_win.cc
+++ b/content/browser/accessibility/accessibility_tree_formatter_win.cc
@@ -76,7 +76,7 @@ void AccessibilityTreeFormatter::AddProperties(
   if (hresult == S_OK)
     dict->SetString("value", msaa_variant.m_str);
 
-  std::vector<string16> state_strings;
+  std::vector<base::string16> state_strings;
   int32 ia_state = acc_obj->ia_state();
 
   // Avoid flakiness: these states depend on whether the window is focused
@@ -87,16 +87,16 @@ void AccessibilityTreeFormatter::AddProperties(
   IAccessibleStateToStringVector(ia_state, &state_strings);
   IAccessible2StateToStringVector(acc_obj->ia2_state(), &state_strings);
   base::ListValue* states = new base::ListValue;
-  for (std::vector<string16>::const_iterator it = state_strings.begin();
+  for (std::vector<base::string16>::const_iterator it = state_strings.begin();
        it != state_strings.end();
        ++it) {
     states->AppendString(UTF16ToUTF8(*it));
   }
   dict->Set("states", states);
 
-  const std::vector<string16>& ia2_attributes = acc_obj->ia2_attributes();
+  const std::vector<base::string16>& ia2_attributes = acc_obj->ia2_attributes();
   base::ListValue* attributes = new base::ListValue;
-  for (std::vector<string16>::const_iterator it = ia2_attributes.begin();
+  for (std::vector<base::string16>::const_iterator it = ia2_attributes.begin();
        it != ia2_attributes.end();
        ++it) {
     attributes->AppendString(UTF16ToUTF8(*it));
@@ -199,15 +199,16 @@ void AccessibilityTreeFormatter::AddProperties(
   }
 }
 
-string16 AccessibilityTreeFormatter::ToString(const base::DictionaryValue& dict,
-                                              const string16& indent) {
-  string16 line;
+base::string16 AccessibilityTreeFormatter::ToString(
+    const base::DictionaryValue& dict,
+    const base::string16& indent) {
+  base::string16 line;
 
-  string16 role_value;
+  base::string16 role_value;
   dict.GetString("role", &role_value);
   WriteAttribute(true, UTF16ToUTF8(role_value), &line);
 
-  string16 name_value;
+  base::string16 name_value;
   dict.GetString("name", &name_value);
   WriteAttribute(true, base::StringPrintf(L"name='%ls'", name_value.c_str()),
                  &line);
@@ -220,7 +221,7 @@ string16 AccessibilityTreeFormatter::ToString(const base::DictionaryValue& dict,
 
     switch (value->GetType()) {
       case base::Value::TYPE_STRING: {
-        string16 string_value;
+        base::string16 string_value;
         value->GetAsString(&string_value);
         WriteAttribute(false,
                        StringPrintf(L"%ls='%ls'",
@@ -257,7 +258,7 @@ string16 AccessibilityTreeFormatter::ToString(const base::DictionaryValue& dict,
         for (base::ListValue::const_iterator it = list_value->begin();
              it != list_value->end();
              ++it) {
-          string16 string_value;
+          base::string16 string_value;
           if ((*it)->GetAsString(&string_value))
             WriteAttribute(false, string_value, &line);
         }