Convert string16 -> base::string16 in components/

components/autofill/common/form_field_data.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 COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_H_
 #define COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_H_
 
 #include <vector>
 
 #include "base/string16.h"
 
 // Stores information about a field in a form.
 struct FormFieldData {
   FormFieldData();
   ~FormFieldData();
 
   // Equality tests for identity which does not include |value| or
   // |is_autofilled|.
   // TODO(dhollowa): These operators need to be revised when we implement field
   // ids.
   bool operator==(const FormFieldData& field) const;
   bool operator!=(const FormFieldData& field) const;
   // Comparison operator exposed for STL map. Uses label, then name to sort.
   bool operator<(const FormFieldData& field) const;
 
-  string16 label;
-  string16 name;
-  string16 value;
+  base::string16 label;
+  base::string16 name;
+  base::string16 value;
   std::string form_control_type;
   std::string autocomplete_attribute;
   size_t max_length;
   bool is_autofilled;
   bool is_checked;
   bool is_checkable;
   bool is_focusable;
   bool should_autocomplete;
 
   // For the HTML snippet |<option value="US">United States</option>|, the
   // value is "US" and the contents are "United States".
-  std::vector<string16> option_values;
-  std::vector<string16> option_contents;
+  std::vector<base::string16> option_values;
+  std::vector<base::string16> option_contents;
 };
 
 // So we can compare FormFieldDatas with EXPECT_EQ().
 std::ostream& operator<<(std::ostream& os, const FormFieldData& field);
 
 // Prefer to use this macro in place of |EXPECT_EQ()| for comparing
 // |FormFieldData|s in test code.
 #define EXPECT_FORM_FIELD_DATA_EQUALS(expected, actual) \
   do { \
     EXPECT_EQ(expected.label, actual.label); \
     EXPECT_EQ(expected.name, actual.name); \
     EXPECT_EQ(expected.value, actual.value); \
     EXPECT_EQ(expected.form_control_type, actual.form_control_type); \
     EXPECT_EQ(expected.autocomplete_attribute, actual.autocomplete_attribute); \
     EXPECT_EQ(expected.max_length, actual.max_length); \
     EXPECT_EQ(expected.is_autofilled, actual.is_autofilled); \
     EXPECT_EQ(expected.is_checked, actual.is_checked); \
     EXPECT_EQ(expected.is_checkable, actual.is_checkable); \
   } while (0)
 
 #endif  // COMPONENTS_AUTOFILL_COMMON_FORM_FIELD_DATA_H_