Make the auto-launch experiment profile-aware.

chrome/browser/ui/browser_init.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/browser_init.h"
 
 #include <algorithm>   // For max().
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 123 matching lines @@
 
 namespace {
 
 static const int kMaxInfobarShown = 5;
 
 #if defined(OS_WIN)
 // The delegate for the infobar shown when Chrome was auto-launched.
 class AutolaunchInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   AutolaunchInfoBarDelegate(InfoBarTabHelper* infobar_helper,
-                            PrefService* prefs);
+                            PrefService* prefs,
+                            Profile* profile);
   virtual ~AutolaunchInfoBarDelegate();
 
  private:
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
   virtual bool ShouldExpire(
       const content::LoadCommittedDetails& details) const OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
   // The prefs to use.
   PrefService* prefs_;
 
   // Whether the user clicked one of the buttons.
   bool action_taken_;
 
   // Whether the info-bar should be dismissed on the next navigation.
   bool should_expire_;
 
+  Profile* profile_;
+
   // Used to delay the expiration of the info-bar.
   base::WeakPtrFactory<AutolaunchInfoBarDelegate> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutolaunchInfoBarDelegate);
 };
 
 AutolaunchInfoBarDelegate::AutolaunchInfoBarDelegate(
     InfoBarTabHelper* infobar_helper,
-    PrefService* prefs)
+    PrefService* prefs,
+    Profile* profile)
     : ConfirmInfoBarDelegate(infobar_helper),
       prefs_(prefs),
       action_taken_(false),
       should_expire_(false),
+      profile_(profile),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   auto_launch_trial::UpdateInfobarShownMetric();
 
   int count = prefs_->GetInteger(prefs::kShownAutoLaunchInfobar);
   prefs_->SetInteger(prefs::kShownAutoLaunchInfobar, count + 1);
 
   // We want the info-bar to stick-around for a few seconds and then be hidden
   // on the next navigation after that.
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
@@ skipping 42 matching lines @@
   // Track infobar reponse.
   auto_launch_trial::UpdateInfobarResponseMetric(
       auto_launch_trial::INFOBAR_CUT_IT_OUT);
   // Also make sure we keep track of how many disable and how many enable.
   const bool auto_launch = false;
   auto_launch_trial::UpdateToggleAutoLaunchMetric(auto_launch);
 
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&auto_launch_util::SetWillLaunchAtLogin,
-                 auto_launch, FilePath()));
+                 auto_launch, FilePath(), profile_->GetPath()));
   return true;
 }
 
 #endif  // OS_WIN
 
 // DefaultBrowserInfoBarDelegate ----------------------------------------------
 
 // The delegate for the infobar shown when Chrome is not the default browser.
 class DefaultBrowserInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
@@ skipping 102 matching lines @@
   Browser* browser = BrowserList::GetLastActive();
   TabContentsWrapper* tab = browser->GetSelectedTabContentsWrapper();
 
   // Don't show the info-bar if there are already info-bars showing.
   InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper();
   if (infobar_helper->infobar_count() > 0)
     return;
 
   infobar_helper->AddInfoBar(
       new AutolaunchInfoBarDelegate(infobar_helper,
-      tab->profile()->GetPrefs()));
+      tab->profile()->GetPrefs(), tab->profile()));
 }
 #endif
 
 void NotifyNotDefaultBrowserCallback() {
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return;  // Reached during ui tests.
 
   // In ChromeBot tests, there might be a race. This line appears to get
   // called during shutdown and |tab| can be NULL.
@@ skipping 1101 matching lines @@
   }
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&CheckDefaultBrowserCallback));
 }
 
 bool BrowserInit::LaunchWithProfile::CheckIfAutoLaunched(Profile* profile) {
 #if defined(OS_WIN)
   if (!auto_launch_trial::IsInAutoLaunchGroup())
     return false;
 
+  // Only supported on the main profile for now.
+  if (profile->GetPath().BaseName().value() != ASCIIToUTF16("Default"))

[grt (UTC plus 2), 2012/02/01 18:45:15]

"Default" -> chrome::kInitialProfile

+    return false;
+
   int infobar_shown =
       profile->GetPrefs()->GetInteger(prefs::kShownAutoLaunchInfobar);
   if (infobar_shown >= kMaxInfobarShown)
     return false;
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kAutoLaunchAtStartup) ||
       first_run::IsChromeFirstRun()) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,

[grt (UTC plus 2), 2012/02/01 18:45:15]

it just occurred to me that this should never run for Chrome Frame.  i believe
that the first run sentinel will already have been created in
ChromeBrowserMainParts::PreCreateThreadsImpl since GCF launches Chrome with
--no-first-run, so IsChromeFirstRun() should be false.  can you confirm this?

[Finnur, 2012/02/06 16:30:36]

This is already guarded against by the IsInAutoLaunchGroup call as we don't
issue ChromeFrame builds with the special brand code needed for the experiment.

But, why rely on that or the sentinel creation or whatever? Why not just
explicitly state we shouldn't do this for ChromeFrame? :)

On 2012/02/01 18:45:15, grt wrote:

[grt (UTC plus 2), 2012/02/06 17:54:48]

Since Chrome and Chrome Frame can use the same bits on the system, I'm concerned
that Chrome's brand code could be picked up by Chrome Frame under some
circumstances.
Sounds good.  Please add a check for switches::kChromeFrame as done elsewhere in
the code.  Thanks.

                             base::Bind(&CheckAutoLaunchCallback));
     return true;
   }
 #endif
   return false;
 }
 
 size_t BrowserInit::LaunchWithProfile::ShowSyncPromoDialog(
     bool process_startup,
     Browser** browser,
@@ skipping 325 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }