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

base/file_version_info_win.h

Index: base/file_version_info_win.h
diff --git a/base/file_version_info_win.h b/base/file_version_info_win.h
index a37857783a94ee43ed7fd7f4c633016bb37c87c1..faacaa268347e2ea4f1b759249f4bf805402be68 100644
--- a/base/file_version_info_win.h
+++ b/base/file_version_info_win.h
@@ -22,21 +22,21 @@ class FileVersionInfoWin : 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;
 
   // Lets you access other properties not covered above.