System toast was trying to launch the per-user chrome

- forgot to pass along the system_install flag.

BUG=32474
TEST=see bug for instructions, you need to simulate a system level install.

TBR=huanr

Review URL: http://codereview.chromium.org/561080

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38172 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 11 insertions, 7 deletions

diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 8b3e009..69557e8 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -489,7 +489,7 @@ bool HandleNonInstallCmdLineOptions(const CommandLine& cmd_line,
     // Launch the inactive user toast experiment.
     std::wstring flavor =
         cmd_line.GetSwitchValue(installer_util::switches::kInactiveUserToast);
-    dist->InactiveUserToastExperiment(StringToInt(flavor));
+    dist->InactiveUserToastExperiment(StringToInt(flavor), system_install);
     return true;
   } else if (cmd_line.HasSwitch(installer_util::switches::kSystemLevelToast)) {
     // We started as system-level and have been re-launched as user level
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 74c735b..d3a2ac3 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -132,5 +132,6 @@ void BrowserDistribution::LaunchUserExperiment(
 }
 
 
-void BrowserDistribution::InactiveUserToastExperiment(int flavor) {
+void BrowserDistribution::InactiveUserToastExperiment(int flavor,
+                                                      bool system_install) {
 }
diff --git a/chrome/installer/util/browser_distribution.h b/chrome/installer/util/browser_distribution.h
index 1112e4a..0d33d8f 100644
--- a/chrome/installer/util/browser_distribution.h
+++ b/chrome/installer/util/browser_distribution.h
@@ -68,7 +68,7 @@ class BrowserDistribution {
 
   // The user has qualified for the inactive user toast experiment and this
   // function just performs it.
-  virtual void InactiveUserToastExperiment(int flavor);
+  virtual void InactiveUserToastExperiment(int flavor, bool system_install);
 
  protected:
   BrowserDistribution() {}
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index debf556..f07a4f2 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -532,7 +532,8 @@ void GoogleChromeDistribution::LaunchUserExperiment(
 }
 
 // User qualifies for the experiment. Launch chrome with --try-chrome=flavor.
-void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor) {
+void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
+    bool system_install) {
   bool has_welcome_url = (flavor == 0);
   // Possibly add a url to launch depending on the experiment flavor.
   std::wstring options(StringPrintf(L"--%ls=%d",
@@ -544,7 +545,8 @@ void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor) {
   }
   // Launch chrome now. It will show the toast UI.
   int32 exit_code = 0;
-  if (!installer::LaunchChromeAndWaitForResult(false, options, &exit_code))
+  if (!installer::LaunchChromeAndWaitForResult(system_install,
+                                               options, &exit_code))
     return;
   // The chrome process has exited, figure out what happened.
   const wchar_t* outcome = NULL;
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h
index 7490a05..c31ca07 100644
--- a/chrome/installer/util/google_chrome_distribution.h
+++ b/chrome/installer/util/google_chrome_distribution.h
@@ -86,7 +86,7 @@ class GoogleChromeDistribution : public BrowserDistribution {
   // Assuming that the user qualifies, this function performs the inactive user
   // toast experiment. It will use chrome to show the UI and it will record the
   // outcome in the registry.
-  virtual void InactiveUserToastExperiment(int flavor);
+  virtual void InactiveUserToastExperiment(int flavor, bool system_install);
 
  private:
   friend class BrowserDistribution;
diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc
index 569dd72..0f13891 100644
--- a/chrome/installer/util/google_chrome_distribution_dummy.cc
+++ b/chrome/installer/util/google_chrome_distribution_dummy.cc
@@ -37,6 +37,7 @@ void GoogleChromeDistribution::LaunchUserExperiment(
     bool system_install) {
   NOTREACHED();
 }
-void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor) {
+void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor,
+                                                           bool system_install) {
   NOTREACHED();
 }