Remove 'using base::string16;' from base/strings/string16.h and remove temporary

base/file_version_info_mac.h

Index: base/file_version_info_mac.h
diff --git a/base/file_version_info_mac.h b/base/file_version_info_mac.h
index f488cce4e58382e7b1da91cb6da994b01d81b58e..f0edb3aea9f00a6a27c246908b31bd8815a0020e 100644
--- a/base/file_version_info_mac.h
+++ b/base/file_version_info_mac.h
@@ -23,27 +23,27 @@ class FileVersionInfoMac : public FileVersionInfo {
 
   // Accessors to the different version properties.
   // Returns an empty string if the property is not found.
-  virtual string16 company_name() OVERRIDE;
-  virtual string16 company_short_name() OVERRIDE;
-  virtual string16 product_name() OVERRIDE;
-  virtual string16 product_short_name() OVERRIDE;
-  virtual string16 internal_name() OVERRIDE;
-  virtual string16 product_version() OVERRIDE;
-  virtual string16 private_build() OVERRIDE;
-  virtual string16 special_build() OVERRIDE;
-  virtual string16 comments() OVERRIDE;
-  virtual string16 original_filename() OVERRIDE;
-  virtual string16 file_description() OVERRIDE;
-  virtual string16 file_version() OVERRIDE;
-  virtual string16 legal_copyright() OVERRIDE;
-  virtual string16 legal_trademarks() OVERRIDE;
-  virtual string16 last_change() OVERRIDE;
+  virtual base::string16 company_name() OVERRIDE;
+  virtual base::string16 company_short_name() OVERRIDE;
+  virtual base::string16 product_name() OVERRIDE;
+  virtual base::string16 product_short_name() OVERRIDE;
+  virtual base::string16 internal_name() OVERRIDE;
+  virtual base::string16 product_version() OVERRIDE;
+  virtual base::string16 private_build() OVERRIDE;
+  virtual base::string16 special_build() OVERRIDE;
+  virtual base::string16 comments() OVERRIDE;
+  virtual base::string16 original_filename() OVERRIDE;
+  virtual base::string16 file_description() OVERRIDE;
+  virtual base::string16 file_version() OVERRIDE;
+  virtual base::string16 legal_copyright() OVERRIDE;
+  virtual base::string16 legal_trademarks() OVERRIDE;
+  virtual base::string16 last_change() OVERRIDE;
   virtual bool is_official_build() OVERRIDE;
 
  private:
-  // Returns a string16 value for a property name.
+  // Returns a base::string16 value for a property name.
   // Returns the empty string if the property does not exist.
-  string16 GetString16Value(CFStringRef name);
+  base::string16 GetString16Value(CFStringRef name);
 
   base::scoped_nsobject<NSBundle> bundle_;