Add base:: to string16s in chrome/.

chrome/installer/util/google_chrome_distribution.h

Index: chrome/installer/util/google_chrome_distribution.h
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index e6bb555c533e488fd53391cd000c41421bf050b0..eaed89017ee2d1835f0efea16a9428c663448d25 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -30,37 +30,37 @@ class GoogleChromeDistribution : public BrowserDistribution {
   virtual void DoPostUninstallOperations(
       const Version& version,
       const base::FilePath& local_data_path,
-      const string16& distribution_data) OVERRIDE;
+      const base::string16& distribution_data) OVERRIDE;
 
-  virtual string16 GetActiveSetupGuid() OVERRIDE;
+  virtual base::string16 GetActiveSetupGuid() OVERRIDE;
 
-  virtual string16 GetAppGuid() OVERRIDE;
+  virtual base::string16 GetAppGuid() OVERRIDE;
 
-  virtual string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;
+  virtual base::string16 GetShortcutName(ShortcutType shortcut_type) OVERRIDE;
 
-  virtual string16 GetIconFilename() OVERRIDE;
+  virtual base::string16 GetIconFilename() OVERRIDE;
 
   virtual int GetIconIndex(ShortcutType shortcut_type) OVERRIDE;
 
-  virtual string16 GetBaseAppName() OVERRIDE;
+  virtual base::string16 GetBaseAppName() OVERRIDE;
 
-  virtual string16 GetBaseAppId() OVERRIDE;
+  virtual base::string16 GetBaseAppId() OVERRIDE;
 
-  virtual string16 GetBrowserProgIdPrefix() OVERRIDE;
+  virtual base::string16 GetBrowserProgIdPrefix() OVERRIDE;
 
-  virtual string16 GetBrowserProgIdDesc() OVERRIDE;
+  virtual base::string16 GetBrowserProgIdDesc() OVERRIDE;
 
-  virtual string16 GetInstallSubDir() OVERRIDE;
+  virtual base::string16 GetInstallSubDir() OVERRIDE;
 
-  virtual string16 GetPublisherName() OVERRIDE;
+  virtual base::string16 GetPublisherName() OVERRIDE;
 
-  virtual string16 GetAppDescription() OVERRIDE;
+  virtual base::string16 GetAppDescription() OVERRIDE;
 
   virtual std::string GetSafeBrowsingName() OVERRIDE;
 
-  virtual string16 GetStateKey() OVERRIDE;
+  virtual base::string16 GetStateKey() OVERRIDE;
 
-  virtual string16 GetStateMediumKey() OVERRIDE;
+  virtual base::string16 GetStateMediumKey() OVERRIDE;
 
   virtual std::string GetNetworkStatsServer() const OVERRIDE;
 
@@ -69,16 +69,16 @@ class GoogleChromeDistribution : public BrowserDistribution {
   // This method reads data from the Google Update ClientState key for
   // potential use in the uninstall survey. It must be called before the
   // key returned by GetVersionKey() is deleted.
-  virtual string16 GetDistributionData(HKEY root_key) OVERRIDE;
+  virtual base::string16 GetDistributionData(HKEY root_key) OVERRIDE;
 
-  virtual string16 GetUninstallLinkName() OVERRIDE;
+  virtual base::string16 GetUninstallLinkName() OVERRIDE;
 
-  virtual string16 GetUninstallRegPath() OVERRIDE;
+  virtual base::string16 GetUninstallRegPath() OVERRIDE;
 
-  virtual string16 GetVersionKey() OVERRIDE;
+  virtual base::string16 GetVersionKey() OVERRIDE;
 
   virtual bool GetCommandExecuteImplClsid(
-      string16* handler_class_uuid) OVERRIDE;
+      base::string16* handler_class_uuid) OVERRIDE;
 
   virtual bool AppHostIsSupported() OVERRIDE;
 
@@ -91,10 +91,10 @@ class GoogleChromeDistribution : public BrowserDistribution {
 
   virtual bool HasUserExperiments() OVERRIDE;
 
-  const string16& product_guid() { return product_guid_; }
+  const base::string16& product_guid() { return product_guid_; }
 
  protected:
-  void set_product_guid(const string16& guid) { product_guid_ = guid; }
+  void set_product_guid(const base::string16& guid) { product_guid_ = guid; }
 
   // Disallow construction from others.
   GoogleChromeDistribution();
@@ -103,7 +103,7 @@ class GoogleChromeDistribution : public BrowserDistribution {
   friend class BrowserDistribution;
 
   // The product ID for Google Update.
-  string16 product_guid_;
+  base::string16 product_guid_;
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_