Add base:: to string16s in chrome/.

chrome/installer/util/install_util.h

Index: chrome/installer/util/install_util.h
diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h
index 40e6c85965bc6f3c924a5daab999c30f5f5fefcc..eaa9e9e4b4b781b9c5d871aa3846f9d4534fd066 100644
--- a/chrome/installer/util/install_util.h
+++ b/chrome/installer/util/install_util.h
@@ -33,7 +33,7 @@ class InstallUtil {
  public:
   // Get the path to this distribution's Active Setup registry entries.
   // e.g. Software\Microsoft\Active Setup\Installed Components\<dist_guid>
-  static string16 GetActiveSetupPath(BrowserDistribution* dist);
+  static base::string16 GetActiveSetupPath(BrowserDistribution* dist);
 
   // Attempts to trigger the command that would be run by Active Setup for a
   // system-level Chrome. For use only when system-level Chrome is installed.
@@ -77,17 +77,17 @@ class InstallUtil {
   // app's ClientState key.  See InstallerState::WriteInstallerResult for more
   // details.
   static void AddInstallerResultItems(bool system_install,
-                                      const string16& state_key,
+                                      const base::string16& state_key,
                                       installer::InstallStatus status,
                                       int string_resource_id,
-                                      const string16* const launch_cmd,
+                                      const base::string16* const launch_cmd,
                                       WorkItemList* install_list);
 
   // Update the installer stage reported by Google Update.  |state_key_path|
   // should be obtained via the state_key method of an InstallerState instance
   // created before the machine state is modified by the installer.
   static void UpdateInstallerStage(bool system_install,
-                                   const string16& state_key_path,
+                                   const base::string16& state_key_path,
                                    installer::InstallerStage stage);
 
   // Returns true if this installation path is per user, otherwise returns
@@ -113,19 +113,19 @@ class InstallUtil {
                                   base::FilePath* path);
 
   // Deletes the registry key at path key_path under the key given by root_key.
-  static bool DeleteRegistryKey(HKEY root_key, const string16& key_path);
+  static bool DeleteRegistryKey(HKEY root_key, const base::string16& key_path);
 
   // Deletes the registry value named value_name at path key_path under the key
   // given by reg_root.
-  static bool DeleteRegistryValue(HKEY reg_root, const string16& key_path,
-                                  const string16& value_name);
+  static bool DeleteRegistryValue(HKEY reg_root, const base::string16& key_path,
+                                  const base::string16& value_name);
 
   // An interface to a predicate function for use by DeleteRegistryKeyIf and
   // DeleteRegistryValueIf.
   class RegistryValuePredicate {
    public:
     virtual ~RegistryValuePredicate() { }
-    virtual bool Evaluate(const string16& value) const = 0;
+    virtual bool Evaluate(const base::string16& value) const = 0;
   };
 
   // The result of a conditional delete operation (i.e., DeleteFOOIf).
@@ -141,8 +141,8 @@ class InstallUtil {
   // the key's default value.
   static ConditionalDeleteResult DeleteRegistryKeyIf(
       HKEY root_key,
-      const string16& key_to_delete_path,
-      const string16& key_to_test_path,
+      const base::string16& key_to_delete_path,
+      const base::string16& key_to_test_path,
       const wchar_t* value_name,
       const RegistryValuePredicate& predicate);
 
@@ -158,11 +158,11 @@ class InstallUtil {
   // A predicate that performs a case-sensitive string comparison.
   class ValueEquals : public RegistryValuePredicate {
    public:
-    explicit ValueEquals(const string16& value_to_match)
+    explicit ValueEquals(const base::string16& value_to_match)
         : value_to_match_(value_to_match) { }
-    virtual bool Evaluate(const string16& value) const OVERRIDE;
+    virtual bool Evaluate(const base::string16& value) const OVERRIDE;
    protected:
-    string16 value_to_match_;
+    base::string16 value_to_match_;
    private:
     DISALLOW_COPY_AND_ASSIGN(ValueEquals);
   };
@@ -171,12 +171,12 @@ class InstallUtil {
   static int GetInstallReturnCode(installer::InstallStatus install_status);
 
   // Composes |program| and |arguments| into |command_line|.
-  static void MakeUninstallCommand(const string16& program,
-                                   const string16& arguments,
+  static void MakeUninstallCommand(const base::string16& program,
+                                   const base::string16& arguments,
                                    CommandLine* command_line);
 
   // Returns a string in the form YYYYMMDD of the current date.
-  static string16 GetCurrentDate();
+  static base::string16 GetCurrentDate();
 
   // A predicate that compares the program portion of a command line with a
   // given file path.  First, the file paths are compared directly.  If they do
@@ -186,7 +186,7 @@ class InstallUtil {
    public:
     explicit ProgramCompare(const base::FilePath& path_to_match);
     virtual ~ProgramCompare();
-    virtual bool Evaluate(const string16& value) const OVERRIDE;
+    virtual bool Evaluate(const base::string16& value) const OVERRIDE;
     bool EvaluatePath(const base::FilePath& path) const;
 
    protected: