Add base:: to string16s in chrome/.

chrome/installer/util/installation_validator.cc

Index: chrome/installer/util/installation_validator.cc
diff --git a/chrome/installer/util/installation_validator.cc b/chrome/installer/util/installation_validator.cc
index 9123ca4b9dea5e307d881defcb6f607830146d85..2ce6243d513e9cd7fb1f7a5960025b8df5f76a72 100644
--- a/chrome/installer/util/installation_validator.cc
+++ b/chrome/installer/util/installation_validator.cc
@@ -169,11 +169,11 @@ const InstallationValidator::InstallationType
 void InstallationValidator::ValidateAppCommandFlags(
     const ProductContext& ctx,
     const AppCommand& app_cmd,
-    const std::set<string16>& flags_exp,
-    const string16& name,
+    const std::set<base::string16>& flags_exp,
+    const base::string16& name,
     bool* is_valid) {
   const struct {
-    const string16 exp_key;
+    const base::string16 exp_key;
     bool val;
     const char* msg;
   } check_list[] = {
@@ -213,7 +213,7 @@ void InstallationValidator::ValidateInstallCommand(
   DCHECK(is_valid);
 
   CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
-  string16 name(expected_command);
+  base::string16 name(expected_command);
 
   base::FilePath expected_path(
       installer::GetChromeInstallPath(ctx.system_install, ctx.dist)
@@ -232,7 +232,7 @@ void InstallationValidator::ValidateInstallCommand(
 
   ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid);
 
-  std::set<string16> flags_exp;
+  std::set<base::string16> flags_exp;
   flags_exp.insert(google_update::kRegSendsPingsField);
   flags_exp.insert(google_update::kRegWebAccessibleField);
   flags_exp.insert(google_update::kRegRunAsUserField);
@@ -267,7 +267,7 @@ void InstallationValidator::ValidateOnOsUpgradeCommand(
   DCHECK(is_valid);
 
   CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
-  string16 name(kCmdOnOsUpgrade);
+  base::string16 name(kCmdOnOsUpgrade);
 
   ValidateSetupPath(ctx, cmd_line.GetProgram(), name, is_valid);
 
@@ -283,7 +283,7 @@ void InstallationValidator::ValidateOnOsUpgradeCommand(
 
   ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid);
 
-  std::set<string16> flags_exp;
+  std::set<base::string16> flags_exp;
   flags_exp.insert(google_update::kRegAutoRunOnOSUpgradeField);
   ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid);
 }
@@ -296,7 +296,7 @@ void InstallationValidator::ValidateQueryEULAAcceptanceCommand(
   DCHECK(is_valid);
 
   CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
-  string16 name(kCmdQueryEULAAcceptance);
+  base::string16 name(kCmdQueryEULAAcceptance);
 
   ValidateSetupPath(ctx, cmd_line.GetProgram(), name, is_valid);
 
@@ -308,7 +308,7 @@ void InstallationValidator::ValidateQueryEULAAcceptanceCommand(
 
   ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid);
 
-  std::set<string16> flags_exp;
+  std::set<base::string16> flags_exp;
   flags_exp.insert(google_update::kRegWebAccessibleField);
   flags_exp.insert(google_update::kRegRunAsUserField);
   ValidateAppCommandFlags(ctx, app_cmd, flags_exp, name, is_valid);
@@ -322,7 +322,7 @@ void InstallationValidator::ValidateQuickEnableApplicationHostCommand(
   DCHECK(is_valid);
 
   CommandLine cmd_line(CommandLine::FromString(app_cmd.command_line()));
-  string16 name(kCmdQuickEnableApplicationHost);
+  base::string16 name(kCmdQuickEnableApplicationHost);
 
   ValidateSetupPath(ctx, cmd_line.GetProgram(), name, is_valid);
 
@@ -339,7 +339,7 @@ void InstallationValidator::ValidateQuickEnableApplicationHostCommand(
 
   ValidateCommandExpectations(ctx, cmd_line, expected, name, is_valid);
 
-  std::set<string16> flags_exp;
+  std::set<base::string16> flags_exp;
   flags_exp.insert(google_update::kRegSendsPingsField);
   flags_exp.insert(google_update::kRegWebAccessibleField);
   flags_exp.insert(google_update::kRegRunAsUserField);
@@ -360,7 +360,7 @@ void InstallationValidator::ValidateAppCommandExpectations(
       ctx.state.commands().GetIterators());
   CommandExpectations::iterator expectation;
   for (; cmd_iterators.first != cmd_iterators.second; ++cmd_iterators.first) {
-    const string16& cmd_id = cmd_iterators.first->first;
+    const base::string16& cmd_id = cmd_iterators.first->first;
     // Do we have an expectation for this command?
     expectation = the_expectations.find(cmd_id);
     if (expectation != the_expectations.end()) {
@@ -506,7 +506,7 @@ void InstallationValidator::ValidateBinaries(
 // Validates the path to |setup_exe| for the product described by |ctx|.
 void InstallationValidator::ValidateSetupPath(const ProductContext& ctx,
                                               const base::FilePath& setup_exe,
-                                              const string16& purpose,
+                                              const base::string16& purpose,
                                               bool* is_valid) {
   DCHECK(is_valid);
 
@@ -536,7 +536,7 @@ void InstallationValidator::ValidateCommandExpectations(
     const ProductContext& ctx,
     const CommandLine& command,
     const SwitchExpectations& expected,
-    const string16& source,
+    const base::string16& source,
     bool* is_valid) {
   for (SwitchExpectations::size_type i = 0, size = expected.size(); i < size;
        ++i) {
@@ -554,10 +554,11 @@ void InstallationValidator::ValidateCommandExpectations(
 
 // Validates that |command|, originating from |source|, is formed properly for
 // the product described by |ctx|
-void InstallationValidator::ValidateUninstallCommand(const ProductContext& ctx,
-                                                     const CommandLine& command,
-                                                     const string16& source,
-                                                     bool* is_valid) {
+void InstallationValidator::ValidateUninstallCommand(
+    const ProductContext& ctx,
+    const CommandLine& command,
+    const base::string16& source,
+    bool* is_valid) {
   DCHECK(is_valid);
 
   ValidateSetupPath(ctx, command.GetProgram(), ASCIIToUTF16("uninstaller"),
@@ -583,7 +584,7 @@ void InstallationValidator::ValidateRenameCommand(const ProductContext& ctx,
   DCHECK(!ctx.state.rename_cmd().empty());
 
   CommandLine command = CommandLine::FromString(ctx.state.rename_cmd());
-  string16 name(ASCIIToUTF16("in-use renamer"));
+  base::string16 name(ASCIIToUTF16("in-use renamer"));
 
   ValidateSetupPath(ctx, command.GetProgram(), name, is_valid);