Make the auto-launch experiment profile-aware.

chrome/browser/ui/webui/options/browser_options_handler.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/browser/ui/webui/options/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
@@ skipping 155 matching lines @@
   pref_change_registrar_.Add(prefs::kURLsToRestoreOnStartup, this);
 
   UpdateSearchEngines();
 
   autocomplete_controller_.reset(new AutocompleteController(profile, this));
 
 #if defined(OS_WIN)
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&BrowserOptionsHandler::CheckAutoLaunch,
                  weak_ptr_factory_for_ui_.GetWeakPtr(),
-                 weak_ptr_factory_for_file_.GetWeakPtr()));
+                 weak_ptr_factory_for_file_.GetWeakPtr(),
+                 profile->GetPath()));
   weak_ptr_factory_for_ui_.DetachFromThread();
 #endif
 }
 
 void BrowserOptionsHandler::CheckAutoLaunch(
-    base::WeakPtr<BrowserOptionsHandler> weak_this) {
+    base::WeakPtr<BrowserOptionsHandler> weak_this,
+    const FilePath& profile_path) {
 #if defined(OS_WIN)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
+  // We don't support this for secondary profiles yet.
+  if (profile_path.BaseName().value() != ASCIIToUTF16("Default"))
+    return;
+
   // Pass in weak pointer to this to avoid race if BrowserOptionsHandler is
   // deleted.
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowserOptionsHandler::CheckAutoLaunchCallback,
                  weak_this,
                  auto_launch_trial::IsInAutoLaunchGroup(),
-                 auto_launch_util::WillLaunchAtLogin(FilePath())));
+                 auto_launch_util::WillLaunchAtLogin(FilePath(),
+                                                     profile_path)));
 #endif
 }
 
 void BrowserOptionsHandler::CheckAutoLaunchCallback(
     bool is_in_auto_launch_group,
     bool will_launch_at_login) {
 #if defined(OS_WIN)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (is_in_auto_launch_group) {
     web_ui()->RegisterMessageCallback("toggleAutoLaunch",
         base::Bind(&BrowserOptionsHandler::ToggleAutoLaunch,
         base::Unretained(this)));
 
     base::FundamentalValue enabled(will_launch_at_login);
     web_ui()->CallJavascriptFunction("BrowserOptions.updateAutoLaunchState",
-      enabled);
+                                     enabled);
   }
 #endif
 }
 
 void BrowserOptionsHandler::UpdateDefaultBrowserState() {
   // Check for side-by-side first.
   if (!ShellIntegration::CanSetAsDefaultBrowser()) {
     SetDefaultBrowserUIString(IDS_OPTIONS_DEFAULTBROWSER_SXS);
     return;
   }
@@ skipping 303 matching lines @@
 #if defined(OS_WIN)
   if (!auto_launch_trial::IsInAutoLaunchGroup())
     return;
 
   bool enable;
   CHECK_EQ(args->GetSize(), 1U);
   CHECK(args->GetBoolean(0, &enable));
 
   // Make sure we keep track of how many disable and how many enable.
   auto_launch_trial::UpdateToggleAutoLaunchMetric(enable);
+  Profile* profile = Profile::FromWebUI(web_ui());
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
-      base::Bind(&auto_launch_util::SetWillLaunchAtLogin, enable, FilePath()));
+      base::Bind(&auto_launch_util::SetWillLaunchAtLogin, enable,
+                 FilePath(), profile->GetPath()));
 #endif  // OS_WIN
 }
 
 void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
   base::FundamentalValue enabled(
       InstantFieldTrial::IsInstantExperiment(profile) &&
       !InstantFieldTrial::IsHiddenExperiment(profile));
   web_ui()->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
                                    enabled);
@@ skipping 14 matching lines @@
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions.Append(entry);
   }
 
   web_ui()->CallJavascriptFunction(
       "BrowserOptions.updateAutocompleteSuggestions", suggestions);
 }