Add base:: to string16s in chrome/.

chrome/installer/util/chrome_frame_operations.h

Index: chrome/installer/util/chrome_frame_operations.h
diff --git a/chrome/installer/util/chrome_frame_operations.h b/chrome/installer/util/chrome_frame_operations.h
index 4d31d00a8a4f44211f62e183ce333ef8d41f8960..fb35a07f5f493cd9136306aed689e14d822d8dd8 100644
--- a/chrome/installer/util/chrome_frame_operations.h
+++ b/chrome/installer/util/chrome_frame_operations.h
@@ -17,31 +17,31 @@ class ChromeFrameOperations : public ProductOperations {
   ChromeFrameOperations() {}
 
   virtual void ReadOptions(const MasterPreferences& prefs,
-                           std::set<string16>* options) const OVERRIDE;
+                           std::set<base::string16>* options) const OVERRIDE;
 
   virtual void ReadOptions(const CommandLine& uninstall_command,
-                           std::set<string16>* options) const OVERRIDE;
+                           std::set<base::string16>* options) const OVERRIDE;
 
   virtual void AddKeyFiles(
-      const std::set<string16>& options,
+      const std::set<base::string16>& options,
       std::vector<base::FilePath>* key_files) const OVERRIDE;
 
   virtual void AddComDllList(
-      const std::set<string16>& options,
+      const std::set<base::string16>& options,
       std::vector<base::FilePath>* com_dll_list) const OVERRIDE;
 
-  virtual void AppendProductFlags(const std::set<string16>& options,
+  virtual void AppendProductFlags(const std::set<base::string16>& options,
                                   CommandLine* cmd_line) const OVERRIDE;
 
-  virtual void AppendRenameFlags(const std::set<string16>& options,
+  virtual void AppendRenameFlags(const std::set<base::string16>& options,
                                  CommandLine* cmd_line) const OVERRIDE;
 
-  virtual bool SetChannelFlags(const std::set<string16>& options,
+  virtual bool SetChannelFlags(const std::set<base::string16>& options,
                                bool set,
                                ChannelInfo* channel_info) const OVERRIDE;
 
   virtual bool ShouldCreateUninstallEntry(
-      const std::set<string16>& options) const OVERRIDE;
+      const std::set<base::string16>& options) const OVERRIDE;
 
   virtual void AddDefaultShortcutProperties(
       BrowserDistribution* dist,
@@ -49,7 +49,7 @@ class ChromeFrameOperations : public ProductOperations {
       ShellUtil::ShortcutProperties* properties) const OVERRIDE;
 
   virtual void LaunchUserExperiment(const base::FilePath& setup_path,
-                                    const std::set<string16>& options,
+                                    const std::set<base::string16>& options,
                                     InstallStatus status,
                                     bool system_level) const OVERRIDE;