Add base:: to string16s in chrome/.

chrome/installer/util/installation_validator.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_
 #define CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_
 
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 77 matching lines @@
   // returning true and populating |type| if valid.
   static bool ValidateInstallationType(bool system_level,
                                        InstallationType* type);
 
  protected:
   struct ProductContext;
   typedef std::vector<std::pair<std::string, bool> > SwitchExpectations;
   typedef void (*CommandValidatorFn)(const ProductContext& ctx,
                                      const AppCommand& app_cmd,
                                      bool* is_valid);
-  typedef std::map<string16, CommandValidatorFn> CommandExpectations;
+  typedef std::map<base::string16, CommandValidatorFn> CommandExpectations;
 
   // An interface to product-specific validation rules.
   class ProductRules {
    public:
     virtual ~ProductRules() { }
     virtual BrowserDistribution::Type distribution_type() const = 0;
     virtual void AddUninstallSwitchExpectations(
         const ProductContext& ctx,
         SwitchExpectations* expectations) const = 0;
     virtual void AddRenameSwitchExpectations(
@@ skipping 71 matching lines @@
     const InstallationState& machine_state;
     bool system_install;
     BrowserDistribution* dist;
     const ProductState& state;
     const ProductRules& rules;
   };
 
   // Helper to validate the values of bool elements in AppCommand, and to output
   // error messages. |flag_expect| is a bit mask specifying the expected
   // presence/absence of bool variables.
-  static void ValidateAppCommandFlags(const ProductContext& ctx,
-                                      const AppCommand& app_cmd,
-                                      const std::set<string16>& flags_expected,
-                                      const string16& name,
-                                      bool* is_valid);
+  static void ValidateAppCommandFlags(
+      const ProductContext& ctx,
+      const AppCommand& app_cmd,
+      const std::set<base::string16>& flags_expected,
+      const base::string16& name,
+      bool* is_valid);
   static void ValidateInstallCommand(const ProductContext& ctx,
                                      const AppCommand& app_cmd,
                                      const wchar_t* expected_command,
                                      const wchar_t* expected_app_name,
                                      const char* expected_switch,
                                      bool* is_valid);
   static void ValidateInstallAppCommand(const ProductContext& ctx,
                                         const AppCommand& app_cmd,
                                         bool* is_valid);
   static void ValidateInstallExtensionCommand(const ProductContext& ctx,
@@ skipping 15 matching lines @@
       const CommandExpectations& expectations,
       bool* is_valid);
   static void ValidateBinariesCommands(const ProductContext& ctx,
                                        bool* is_valid);
   static void ValidateBinaries(const InstallationState& machine_state,
                                bool system_install,
                                const ProductState& binaries_state,
                                bool* is_valid);
   static void ValidateSetupPath(const ProductContext& ctx,
                                 const base::FilePath& setup_exe,
-                                const string16& purpose,
+                                const base::string16& purpose,
                                 bool* is_valid);
   static void ValidateCommandExpectations(const ProductContext& ctx,
                                           const CommandLine& command,
                                           const SwitchExpectations& expected,
-                                          const string16& source,
+                                          const base::string16& source,
                                           bool* is_valid);
   static void ValidateUninstallCommand(const ProductContext& ctx,
                                        const CommandLine& command,
-                                       const string16& source,
+                                       const base::string16& source,
                                        bool* is_valid);
   static void ValidateRenameCommand(const ProductContext& ctx,
                                     bool* is_valid);
   static void ValidateOldVersionValues(const ProductContext& ctx,
                                        bool* is_valid);
   static void ValidateMultiInstallProduct(const ProductContext& ctx,
                                           bool* is_valid);
   static void ValidateAppCommands(const ProductContext& ctx,
                                   bool* is_valid);
   static void ValidateUsageStats(const ProductContext& ctx,
                                  bool* is_valid);
   static void ValidateProduct(const InstallationState& machine_state,
                               bool system_install,
                               const ProductState& product_state,
                               const ProductRules& rules,
                               bool* is_valid);
 
   // A collection of all valid installation types.
   static const InstallationType kInstallationTypes[];
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstallationValidator);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_