Add base:: to string16s in chrome/.

chrome/installer/util/google_chrome_distribution_dummy.cc

Index: chrome/installer/util/google_chrome_distribution_dummy.cc
diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc
index 5c3f7be1e7d4de430df1f51dc2c9e56dc6f5e0d5..84293076be5a2347286f2dcc6358f86ded55d415 100644
--- a/chrome/installer/util/google_chrome_distribution_dummy.cc
+++ b/chrome/installer/util/google_chrome_distribution_dummy.cc
@@ -23,27 +23,28 @@ GoogleChromeDistribution::GoogleChromeDistribution()
 void GoogleChromeDistribution::DoPostUninstallOperations(
     const Version& version,
     const base::FilePath& local_data_path,
-    const string16& distribution_data) {
+    const base::string16& distribution_data) {
 }
 
-string16 GoogleChromeDistribution::GetActiveSetupGuid() {
+base::string16 GoogleChromeDistribution::GetActiveSetupGuid() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetAppGuid() {
+base::string16 GoogleChromeDistribution::GetAppGuid() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetBaseAppName() {
+base::string16 GoogleChromeDistribution::GetBaseAppName() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetShortcutName(ShortcutType shortcut_type) {
+base::string16 GoogleChromeDistribution::GetShortcutName(
+    ShortcutType shortcut_type) {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 int GoogleChromeDistribution::GetIconIndex(ShortcutType shortcut_type) {
@@ -51,34 +52,34 @@ int GoogleChromeDistribution::GetIconIndex(ShortcutType shortcut_type) {
   return 0;
 }
 
-string16 GoogleChromeDistribution::GetBaseAppId() {
+base::string16 GoogleChromeDistribution::GetBaseAppId() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetBrowserProgIdPrefix() {
+base::string16 GoogleChromeDistribution::GetBrowserProgIdPrefix() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetBrowserProgIdDesc() {
+base::string16 GoogleChromeDistribution::GetBrowserProgIdDesc() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetInstallSubDir() {
+base::string16 GoogleChromeDistribution::GetInstallSubDir() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetPublisherName() {
+base::string16 GoogleChromeDistribution::GetPublisherName() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetAppDescription() {
+base::string16 GoogleChromeDistribution::GetAppDescription() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 std::string GoogleChromeDistribution::GetSafeBrowsingName() {
@@ -86,14 +87,14 @@ std::string GoogleChromeDistribution::GetSafeBrowsingName() {
   return std::string();
 }
 
-string16 GoogleChromeDistribution::GetStateKey() {
+base::string16 GoogleChromeDistribution::GetStateKey() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetStateMediumKey() {
+base::string16 GoogleChromeDistribution::GetStateMediumKey() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 std::string GoogleChromeDistribution::GetNetworkStatsServer() const {
@@ -106,33 +107,33 @@ std::string GoogleChromeDistribution::GetHttpPipeliningTestServer() const {
   return std::string();
 }
 
-string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
+base::string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetUninstallLinkName() {
+base::string16 GoogleChromeDistribution::GetUninstallLinkName() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetUninstallRegPath() {
+base::string16 GoogleChromeDistribution::GetUninstallRegPath() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetVersionKey() {
+base::string16 GoogleChromeDistribution::GetVersionKey() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
-string16 GoogleChromeDistribution::GetIconFilename() {
+base::string16 GoogleChromeDistribution::GetIconFilename() {
   NOTREACHED();
-  return string16();
+  return base::string16();
 }
 
 bool GoogleChromeDistribution::GetCommandExecuteImplClsid(
-    string16* handler_class_uuid) {
+    base::string16* handler_class_uuid) {
   NOTREACHED();
   return false;
 }