Add base:: to string16s in chrome/.

chrome/installer/util/browser_distribution.h

Index: chrome/installer/util/browser_distribution.h
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index 61f249b61afb6658a8bb845c06ba8644a105363f..16d25009e361a519ce86a14c5bbe6028436bb5b6 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -54,46 +54,48 @@ class BrowserDistribution {
 
   Type GetType() const { return type_; }
 
-  virtual void DoPostUninstallOperations(const Version& version,
-                                         const base::FilePath& local_data_path,
-                                         const string16& distribution_data);
+  virtual void DoPostUninstallOperations(
+      const Version& version,
+      const base::FilePath& local_data_path,
+      const base::string16& distribution_data);
 
   // Returns the GUID to be used when registering for Active Setup.
-  virtual string16 GetActiveSetupGuid();
+  virtual base::string16 GetActiveSetupGuid();
 
-  virtual string16 GetAppGuid();
+  virtual base::string16 GetAppGuid();
 
   // Returns the unsuffixed application name of this program.
   // This is the base of the name registered with Default Programs on Windows.
   // IMPORTANT: This should only be called by the installer which needs to make
   // decisions on the suffixing of the upcoming install, not by external callers
   // at run-time.
-  virtual string16 GetBaseAppName();
+  virtual base::string16 GetBaseAppName();
 
   // Returns the localized display name of this distribution.
-  virtual string16 GetDisplayName();
+  virtual base::string16 GetDisplayName();
 
   // Returns the localized name of the shortcut identified by |shortcut_type|
   // for this distribution.
-  virtual string16 GetShortcutName(ShortcutType shortcut_type);
+  virtual base::string16 GetShortcutName(ShortcutType shortcut_type);
 
   // Returns the index of the icon for the product identified by
   // |shortcut_type|, inside the file specified by GetIconFilename().
   virtual int GetIconIndex(ShortcutType shortcut_type);
 
   // Returns the executable filename (not path) that contains the product icon.
-  virtual string16 GetIconFilename();
+  virtual base::string16 GetIconFilename();
 
   // Returns the localized name of the subfolder in the Start Menu identified by
   // |subfolder_type| that this distribution should create shortcuts in. For
   // SUBFOLDER_CHROME this returns GetShortcutName(SHORTCUT_CHROME).
-  virtual string16 GetStartMenuShortcutSubfolder(Subfolder subfolder_type);
+  virtual base::string16 GetStartMenuShortcutSubfolder(
+      Subfolder subfolder_type);
 
   // Returns the unsuffixed appid of this program.
   // The AppUserModelId is a property of Windows programs.
   // IMPORTANT: This should only be called by ShellUtil::GetAppId as the appid
   // should be suffixed in all scenarios.
-  virtual string16 GetBaseAppId();
+  virtual base::string16 GetBaseAppId();
 
   // Returns the Browser ProgId prefix (e.g. ChromeHTML, ChromiumHTM, etc...).
   // The full id is of the form |prefix|.|suffix| and is limited to a maximum
@@ -102,38 +104,38 @@ class BrowserDistribution {
   // |suffix| as a fixed-length 26-character alphanumeric identifier, therefore
   // the return value of this function must have a maximum length of
   // 39 - 1(null-term) - 26(|suffix|) - 1(dot separator) = 11 characters.
-  virtual string16 GetBrowserProgIdPrefix();
+  virtual base::string16 GetBrowserProgIdPrefix();
 
   // Returns the Browser ProgId description.
-  virtual string16 GetBrowserProgIdDesc();
+  virtual base::string16 GetBrowserProgIdDesc();
 
-  virtual string16 GetInstallSubDir();
+  virtual base::string16 GetInstallSubDir();
 
-  virtual string16 GetPublisherName();
+  virtual base::string16 GetPublisherName();
 
-  virtual string16 GetAppDescription();
+  virtual base::string16 GetAppDescription();
 
-  virtual string16 GetLongAppDescription();
+  virtual base::string16 GetLongAppDescription();
 
   virtual std::string GetSafeBrowsingName();
 
-  virtual string16 GetStateKey();
+  virtual base::string16 GetStateKey();
 
-  virtual string16 GetStateMediumKey();
+  virtual base::string16 GetStateMediumKey();
 
   virtual std::string GetNetworkStatsServer() const;
 
   virtual std::string GetHttpPipeliningTestServer() const;
 
 #if defined(OS_WIN)
-  virtual string16 GetDistributionData(HKEY root_key);
+  virtual base::string16 GetDistributionData(HKEY root_key);
 #endif
 
-  virtual string16 GetUninstallLinkName();
+  virtual base::string16 GetUninstallLinkName();
 
-  virtual string16 GetUninstallRegPath();
+  virtual base::string16 GetUninstallRegPath();
 
-  virtual string16 GetVersionKey();
+  virtual base::string16 GetVersionKey();
 
   // Returns an enum specifying the different ways in which this distribution
   // is allowed to be set as default.
@@ -141,12 +143,12 @@ class BrowserDistribution {
 
   virtual bool CanCreateDesktopShortcuts();
 
-  virtual bool GetChromeChannel(string16* channel);
+  virtual bool GetChromeChannel(base::string16* channel);
 
   // Returns true if this distribution includes a DelegateExecute verb handler,
   // and provides the CommandExecuteImpl class UUID if |handler_class_uuid| is
   // non-NULL.
-  virtual bool GetCommandExecuteImplClsid(string16* handler_class_uuid);
+  virtual bool GetCommandExecuteImplClsid(base::string16* handler_class_uuid);
 
   // Returns true if this distribution uses app_host.exe to run platform apps.
   virtual bool AppHostIsSupported();