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

base/file_version_info_mac.mm

 // 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.
 
 #include "base/file_version_info_mac.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 }
 
 // static
 FileVersionInfo* FileVersionInfo::CreateFileVersionInfo(
     const base::FilePath& file_path) {
   NSString* path = base::SysUTF8ToNSString(file_path.value());
   NSBundle* bundle = [NSBundle bundleWithPath:path];
   return new FileVersionInfoMac(bundle);
 }
 
-string16 FileVersionInfoMac::company_name() {
-  return string16();
+base::string16 FileVersionInfoMac::company_name() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::company_short_name() {
-  return string16();
+base::string16 FileVersionInfoMac::company_short_name() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::internal_name() {
-  return string16();
+base::string16 FileVersionInfoMac::internal_name() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::product_name() {
+base::string16 FileVersionInfoMac::product_name() {
   return GetString16Value(kCFBundleNameKey);
 }
 
-string16 FileVersionInfoMac::product_short_name() {
+base::string16 FileVersionInfoMac::product_short_name() {
   return GetString16Value(kCFBundleNameKey);
 }
 
-string16 FileVersionInfoMac::comments() {
-  return string16();
+base::string16 FileVersionInfoMac::comments() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::legal_copyright() {
+base::string16 FileVersionInfoMac::legal_copyright() {
   return GetString16Value(CFSTR("CFBundleGetInfoString"));
 }
 
-string16 FileVersionInfoMac::product_version() {
+base::string16 FileVersionInfoMac::product_version() {
   // On OS X, CFBundleVersion is used by LaunchServices, and must follow
   // specific formatting rules, so the four-part Chrome version is in
   // CFBundleShortVersionString. On iOS, however, CFBundleVersion can be the
   // full version, but CFBundleShortVersionString has a policy-enfoced limit
   // of three version components.
 #if defined(OS_IOS)
   return GetString16Value(CFSTR("CFBundleVersion"));
 #else
   return GetString16Value(CFSTR("CFBundleShortVersionString"));
 #endif  // defined(OS_IOS)
 }
 
-string16 FileVersionInfoMac::file_description() {
-  return string16();
+base::string16 FileVersionInfoMac::file_description() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::legal_trademarks() {
-  return string16();
+base::string16 FileVersionInfoMac::legal_trademarks() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::private_build() {
-  return string16();
+base::string16 FileVersionInfoMac::private_build() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::file_version() {
+base::string16 FileVersionInfoMac::file_version() {
   return product_version();
 }
 
-string16 FileVersionInfoMac::original_filename() {
+base::string16 FileVersionInfoMac::original_filename() {
   return GetString16Value(kCFBundleNameKey);
 }
 
-string16 FileVersionInfoMac::special_build() {
-  return string16();
+base::string16 FileVersionInfoMac::special_build() {
+  return base::string16();
 }
 
-string16 FileVersionInfoMac::last_change() {
+base::string16 FileVersionInfoMac::last_change() {
   return GetString16Value(CFSTR("SCMRevision"));
 }
 
 bool FileVersionInfoMac::is_official_build() {
 #if defined (GOOGLE_CHROME_BUILD)
   return true;
 #else
   return false;
 #endif
 }
 
-string16 FileVersionInfoMac::GetString16Value(CFStringRef name) {
+base::string16 FileVersionInfoMac::GetString16Value(CFStringRef name) {
   if (bundle_) {
     NSString *ns_name = base::mac::CFToNSCast(name);
     NSString* value = [bundle_ objectForInfoDictionaryKey:ns_name];
     if (value) {
       return base::SysNSStringToUTF16(value);
     }
   }
-  return string16();
+  return base::string16();
 }