Convert string16 -> base::string16 in components/

components/autofill/browser/form_group.h

Index: components/autofill/browser/form_group.h
diff --git a/components/autofill/browser/form_group.h b/components/autofill/browser/form_group.h
index c0038b579b075d07e421d43a9a3c4b8ce9a152ba..4adda2fedd42f83bcfd10229f9e885230cc61f5f 100644
--- a/components/autofill/browser/form_group.h
+++ b/components/autofill/browser/form_group.h
@@ -30,7 +30,7 @@ class FormGroup {
   // into the field, interpreted in the given |app_locale| if appropriate.  The
   // field types can then be reported back to the server.  This method is
   // additive on |matching_types|.
-  virtual void GetMatchingTypes(const string16& text,
+  virtual void GetMatchingTypes(const base::string16& text,
                                 const std::string& app_locale,
                                 FieldTypeSet* matching_types) const;
 
@@ -41,22 +41,23 @@ class FormGroup {
 
   // Returns the string associated with |type|, without canonicalizing the
   // returned value.  For user-visible strings, use GetInfo() instead.
-  virtual string16 GetRawInfo(AutofillFieldType type) const = 0;
+  virtual base::string16 GetRawInfo(AutofillFieldType type) const = 0;
 
   // Sets this FormGroup object's data for |type| to |value|, without
   // canonicalizing the |value|.  For data that has not already been
   // canonicalized, use SetInfo() instead.
-  virtual void SetRawInfo(AutofillFieldType type, const string16& value) = 0;
+  virtual void SetRawInfo(AutofillFieldType type,
+                          const base::string16& value) = 0;
 
   // Returns the string that should be auto-filled into a text field given the
   // type of that field, localized to the given |app_locale| if appropriate.
-  virtual string16 GetInfo(AutofillFieldType type,
-                           const std::string& app_locale) const;
+  virtual base::string16 GetInfo(AutofillFieldType type,
+                                 const std::string& app_locale) const;
 
   // Used to populate this FormGroup object with data.  Canonicalizes the data
   // according to the specified |app_locale| prior to storing, if appropriate.
   virtual bool SetInfo(AutofillFieldType type,
-                       const string16& value,
+                       const base::string16& value,
                        const std::string& app_locale);
 
   // Set |field_data|'s value based on |field| and contents of |this| (using
@@ -75,7 +76,7 @@ class FormGroup {
   // Returns true if |value| is a valid US state name or abbreviation.  It is
   // case insensitive.  Valid for US states only.
   // TODO(estade): this is a crappy place for this function.
-  static bool IsValidState(const string16& value);
+  static bool IsValidState(const base::string16& value);
 
  protected:
   // AutofillProfile needs to call into GetSupportedTypes() for objects of