Add base:: to string16s in chrome/.

chrome/installer/util/chrome_app_host_operations.cc

 // 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.
 
 #include "chrome/installer/util/chrome_app_host_operations.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace installer {
 
 void ChromeAppHostOperations::ReadOptions(const MasterPreferences& prefs,
-                                          std::set<string16>* options) const {
+                                          std::set<base::string16>* options)
+    const {
   DCHECK(options);
 
   bool pref_value;
   if (prefs.GetBool(master_preferences::kMultiInstall, &pref_value) &&
       pref_value) {
     options->insert(kOptionMultiInstall);
   }
 }
 
 void ChromeAppHostOperations::ReadOptions(const CommandLine& uninstall_command,
-                                          std::set<string16>* options) const {
+                                          std::set<base::string16>* options)
+    const {
   DCHECK(options);
 
   if (uninstall_command.HasSwitch(switches::kMultiInstall))
     options->insert(kOptionMultiInstall);
 }
 
 void ChromeAppHostOperations::AddKeyFiles(
-    const std::set<string16>& options,
+    const std::set<base::string16>& options,
     std::vector<base::FilePath>* key_files) const {
 }
 
 void ChromeAppHostOperations::AddComDllList(
-    const std::set<string16>& options,
+    const std::set<base::string16>& options,
     std::vector<base::FilePath>* com_dll_list) const {
 }
 
 void ChromeAppHostOperations::AppendProductFlags(
-    const std::set<string16>& options,
+    const std::set<base::string16>& options,
     CommandLine* cmd_line) const {
   DCHECK(cmd_line);
   bool is_multi_install = options.find(kOptionMultiInstall) != options.end();
 
   // Non-multi-install not supported for the app host.
   DCHECK(is_multi_install);
 
   // Add --multi-install if it isn't already there.
   if (is_multi_install && !cmd_line->HasSwitch(switches::kMultiInstall))
     cmd_line->AppendSwitch(switches::kMultiInstall);
 
   // Add --app-launcher.
   cmd_line->AppendSwitch(switches::kChromeAppLauncher);
 }
 
 void ChromeAppHostOperations::AppendRenameFlags(
-    const std::set<string16>& options,
+    const std::set<base::string16>& options,
     CommandLine* cmd_line) const {
   DCHECK(cmd_line);
   bool is_multi_install = options.find(kOptionMultiInstall) != options.end();
 
   // Non-multi-install not supported for the app host.
   DCHECK(is_multi_install);
 
   // Add --multi-install if it isn't already there.
   if (is_multi_install && !cmd_line->HasSwitch(switches::kMultiInstall))
     cmd_line->AppendSwitch(switches::kMultiInstall);
 }
 
-bool ChromeAppHostOperations::SetChannelFlags(const std::set<string16>& options,
-                                              bool set,
-                                              ChannelInfo* channel_info) const {
+bool ChromeAppHostOperations::SetChannelFlags(
+    const std::set<base::string16>& options,
+    bool set,
+    ChannelInfo* channel_info) const {
 #if defined(GOOGLE_CHROME_BUILD)
   DCHECK(channel_info);
   return channel_info->SetAppLauncher(set);
 #else
   return false;
 #endif
 }
 
 bool ChromeAppHostOperations::ShouldCreateUninstallEntry(
-    const std::set<string16>& options) const {
+    const std::set<base::string16>& options) const {
   return true;
 }
 
 void ChromeAppHostOperations::AddDefaultShortcutProperties(
     BrowserDistribution* dist,
     const base::FilePath& target_exe,
     ShellUtil::ShortcutProperties* properties) const {
   if (!properties->has_target())
     properties->set_target(target_exe);
 
   if (!properties->has_arguments()) {
     CommandLine app_host_args(CommandLine::NO_PROGRAM);
     app_host_args.AppendSwitch(::switches::kShowAppList);
     properties->set_arguments(app_host_args.GetCommandLineString());
   }
 
   if (!properties->has_icon())
     properties->set_icon(target_exe,
         dist->GetIconIndex(BrowserDistribution::SHORTCUT_APP_LAUNCHER));
 
   if (!properties->has_app_id()) {
-    std::vector<string16> components;
+    std::vector<base::string16> components;
     components.push_back(dist->GetBaseAppId());
     properties->set_app_id(ShellUtil::BuildAppModelId(components));
   }
 }
 
 void ChromeAppHostOperations::LaunchUserExperiment(
     const base::FilePath& setup_path,
-    const std::set<string16>& options,
+    const std::set<base::string16>& options,
     InstallStatus status,
     bool system_level) const {
   // No experiments yet.  If adding some in the future, need to have
   // ChromeAppHostDistribution::HasUserExperiments() return true.
   NOTREACHED();
 }
 
 }  // namespace installer