More installer refactoring in the interest of fixing some bugs and cleaning t...

chrome/installer/util/google_chrome_distribution.cc

 // Copyright (c) 2011 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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
@@ skipping 235 matching lines @@
   // able to use the duplicated handle above (Google Update results).
   bool launched = base::LaunchAppAsUser(user_token,
                                         cmd_line.command_line_string(),
                                         false, NULL, true, true);
   ::CloseHandle(user_token);
   return launched;
 }
 
 }  // namespace
 
-GoogleChromeDistribution::GoogleChromeDistribution(
-    const installer::MasterPreferences& prefs)
-        : BrowserDistribution(prefs), product_guid_(kChromeGuid) {
+GoogleChromeDistribution::GoogleChromeDistribution()
+    : BrowserDistribution(CHROME_BROWSER),
+      product_guid_(kChromeGuid) {
 }
 
 // The functions below are not used by the 64-bit Windows binary -
 // see the comment in google_chrome_distribution_dummy.cc
 #ifndef _WIN64
 bool GoogleChromeDistribution::BuildUninstallMetricsString(
     DictionaryValue* uninstall_metrics_dict, std::wstring* metrics) {
   DCHECK(NULL != metrics);
   bool has_values = false;
 
@@ skipping 357 matching lines @@
   // User level: The experiment needs to be performed in a different process
   // because google_update expects the upgrade process to be quick and nimble.
   // System level: We have already been relaunched, so we don't need to be
   // quick, but we relaunch to follow the exact same codepath.
   RelaunchSetup(installer::switches::kInactiveUserToast, flavor,
                 system_level);
 }
 
 // User qualifies for the experiment. Launch chrome with --try-chrome=flavor.
 void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
-    const installer::Product& installation) {
+    const installer::Product& installation,
+    const FilePath& application_path) {
   bool has_welcome_url = (flavor == 0);
   // Possibly add a url to launch depending on the experiment flavor.
   CommandLine options(CommandLine::NO_PROGRAM);
   options.AppendSwitchNative(switches::kTryChromeAgain,
       base::IntToString16(flavor));
   if (has_welcome_url) {
     // Prepend the url with a space.
     std::wstring url(GetWelcomeBackUrl());
     options.AppendArg("--");
     options.AppendArgNative(url);
     // The command line should now have the url added as:
     // "chrome.exe -- <url>"
     DCHECK_NE(std::wstring::npos,
         options.command_line_string().find(L" -- " + url));
   }
   // Launch chrome now. It will show the toast UI.
   int32 exit_code = 0;
-  if (!installation.LaunchChromeAndWait(options, &exit_code))
+  if (!installation.LaunchChromeAndWait(application_path, options, &exit_code))
     return;
 
   // The chrome process has exited, figure out what happened.
   const wchar_t* outcome = NULL;
   switch (exit_code) {
     case ResultCodes::NORMAL_EXIT:
       outcome = kToastExpTriesOkGroup;
       break;
     case ResultCodes::NORMAL_EXIT_CANCEL:
       outcome = kToastExpCancelGroup;
@@ skipping 16 matching lines @@
   // running.
   bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
       installer::switches::kSystemLevelToast);
 
   std::wstring cmd(InstallUtil::GetChromeUninstallCmd(
       system_level_toast, this));
 
   base::LaunchApp(cmd, false, false, NULL);
 }
 #endif
-
-bool GoogleChromeDistribution::SetChannelFlags(
-    bool set,
-    installer::ChannelInfo* channel_info) {
-  DCHECK(channel_info);
-  return channel_info->SetChrome(set);
-}