Convert string16 to base::string16 in content.

content/browser/accessibility/accessibility_tree_formatter_win.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 "content/browser/accessibility/accessibility_tree_formatter.h"
 
 #include <oleacc.h>
 
 #include <string>
 
@@ skipping 58 matching lines @@
   dict->SetString("role", IAccessible2RoleToString(acc_obj->ia2_role()));
 
   CComBSTR msaa_variant;
   HRESULT hresult = acc_obj->get_accName(variant_self, &msaa_variant);
   if (hresult == S_OK)
     dict->SetString("name", msaa_variant.m_str);
   hresult = acc_obj->get_accValue(variant_self, &msaa_variant);
   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
   // and the position of the mouse cursor.
   ia_state &= ~STATE_SYSTEM_HOTTRACKED;
   ia_state &= ~STATE_SYSTEM_OFFSCREEN;
 
   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));
   }
   dict->Set("attributes", attributes);
 
   dict->SetString("role_name", acc_obj->role_name());
 
   VARIANT currentValue;
   if (acc_obj->get_currentValue(&currentValue) == S_OK)
@@ skipping 82 matching lines @@
     if (n_selections > 0) {
       LONG start, end;
       if (acc_obj->get_selection(0, &start, &end) == S_OK) {
         dict->SetInteger("selection_start", start);
         dict->SetInteger("selection_end", end);
       }
     }
   }
 }
 
-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);
 
   for (int i = 0; i < arraysize(ALL_ATTRIBUTES); i++) {
     const char* attribute_name = ALL_ATTRIBUTES[i];
     const base::Value* value;
     if (!dict.Get(attribute_name, &value))
       continue;
 
     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'",
                                     UTF8ToUTF16(attribute_name).c_str(),
                                     string_value.c_str()),
                        &line);
         break;
       }
       case base::Value::TYPE_INTEGER: {
         int int_value;
@@ skipping 16 matching lines @@
         break;
       }
       case base::Value::TYPE_LIST: {
         // Currently all list values are string and are written without
         // attribute names.
         const base::ListValue* list_value;
         value->GetAsList(&list_value);
         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);
         }
         break;
       }
       case base::Value::TYPE_DICTIONARY: {
         // Currently all dictionary values are coordinates.
         // Revisit this if that changes.
         const base::DictionaryValue* dict_value;
         value->GetAsDictionary(&dict_value);
@@ skipping 39 matching lines @@
 const std::string AccessibilityTreeFormatter::GetAllowString() {
   return "@WIN-ALLOW:";
 }
 
 // static
 const std::string AccessibilityTreeFormatter::GetDenyString() {
   return "@WIN-DENY:";
 }
 
 }  // namespace content