Convert string16 -> base::string16 in components/

components/autofill/browser/phone_number.h

Index: components/autofill/browser/phone_number.h
diff --git a/components/autofill/browser/phone_number.h b/components/autofill/browser/phone_number.h
index 79b780dd7ed534b124aa423a01153e240b749eb1..50cc99f414c16af8a367ad087653f94ae1c3ae5d 100644
--- a/components/autofill/browser/phone_number.h
+++ b/components/autofill/browser/phone_number.h
@@ -28,16 +28,16 @@ class PhoneNumber : public FormGroup {
   void set_profile(AutofillProfile* profile) { profile_ = profile; }
 
   // FormGroup implementation:
-  virtual void GetMatchingTypes(const string16& text,
+  virtual void GetMatchingTypes(const base::string16& text,
                                 const std::string& app_locale,
                                 FieldTypeSet* matching_types) const OVERRIDE;
-  virtual string16 GetRawInfo(AutofillFieldType type) const OVERRIDE;
+  virtual base::string16 GetRawInfo(AutofillFieldType type) const OVERRIDE;
   virtual void SetRawInfo(AutofillFieldType type,
-                          const string16& value) OVERRIDE;
-  virtual string16 GetInfo(AutofillFieldType type,
+                          const base::string16& value) OVERRIDE;
+  virtual base::string16 GetInfo(AutofillFieldType type,
                            const std::string& app_locale) const OVERRIDE;
   virtual bool SetInfo(AutofillFieldType type,
-                       const string16& value,
+                       const base::string16& value,
                        const std::string& app_locale) OVERRIDE;
 
   // Size and offset of the prefix and suffix portions of phone numbers.
@@ -54,7 +54,7 @@ class PhoneNumber : public FormGroup {
 
     // If |type| is a phone field type, saves the |value| accordingly and
     // returns true.  For all other field types returs false.
-    bool SetInfo(AutofillFieldType type, const string16& value);
+    bool SetInfo(AutofillFieldType type, const base::string16& value);
 
     // Parses the number built up from pieces stored via SetInfo() according to
     // the specified |profile|'s country code, falling back to the given
@@ -62,16 +62,16 @@ class PhoneNumber : public FormGroup {
     // true if parsing was successful, false otherwise.
     bool ParseNumber(const AutofillProfile& profile,
                      const std::string& app_locale,
-                     string16* value);
+                     base::string16* value);
 
     // Returns true if both |phone_| and |whole_number_| are empty.
     bool IsEmpty() const;
 
    private:
-    string16 country_;
-    string16 city_;
-    string16 phone_;
-    string16 whole_number_;
+    base::string16 country_;
+    base::string16 city_;
+    base::string16 phone_;
+    base::string16 whole_number_;
   };
 
  private:
@@ -83,7 +83,7 @@ class PhoneNumber : public FormGroup {
   void UpdateCacheIfNeeded(const std::string& app_locale) const;
 
   // The phone number.
-  string16 number_;
+  base::string16 number_;
   // Profile which stores the region used as hint when normalizing the number.
   const AutofillProfile* profile_;  // WEAK