Make the auto-launch experiment profile-aware.

chrome/installer/util/auto_launch_util.cc

Index: chrome/installer/util/auto_launch_util.cc
===================================================================
--- chrome/installer/util/auto_launch_util.cc	(revision 120769)
+++ chrome/installer/util/auto_launch_util.cc	(working copy)
@@ -1,27 +1,63 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/auto_launch_util.h"
 
+#include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/string16.h"
+#include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/chrome_version_info.h"
+#include "chrome/installer/util/browser_distribution.h"
+#include "chrome/installer/util/product.h"
 #include "chrome/installer/util/util_constants.h"
+#include "crypto/sha2.h"
 
 namespace auto_launch_util {
 
-// The name of the Chrome Auto-launch key under the Run key.
+// The prefix of the Chrome Auto-launch key under the Run key.
 const wchar_t kAutolaunchKeyValue[] = L"GoogleChromeAutoLaunch";
 
-bool WillLaunchAtLogin(const FilePath& application_path) {
+// A helper function that takes a |profile_path| and builds a registry key
+// name to use when deciding where to read/write the auto-launch value
+// to/from. It takes into account the name of the profile (so that different
+// installations of Chrome don't conflict, and so the in the future different
+// profiles can be auto-launched (or not) separately).
+string16 ProfileToKeyName(const string16& profile_directory) {
+  FilePath path;
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kUserDataDir)) {
+    path = command_line.GetSwitchValuePath(switches::kUserDataDir);
+  } else {
+    // Get the path from the same source as the installer, to make sure there
+    // are no differences.
+    BrowserDistribution* distribution =
+        BrowserDistribution::GetSpecificDistribution(
+            BrowserDistribution::CHROME_BROWSER);
+    installer::Product product(distribution);
+    path = product.GetUserDataPath();
+  }
+  path = path.Append(profile_directory);
+
+  std::string input(path.AsUTF8Unsafe());
+  uint8 hash[16];
+  crypto::SHA256HashString(input, hash, sizeof(hash));
+  std::string hash_string = base::HexEncode(hash, sizeof(hash));
+  return string16(kAutolaunchKeyValue) +
+      ASCIIToWide("_") + ASCIIToWide(hash_string);
+}
+
+bool WillLaunchAtLogin(const FilePath& application_path,
+                       const string16& profile_directory) {
+  string16 key_name(ProfileToKeyName(profile_directory));
   string16 autolaunch;
   if (!base::win::ReadCommandFromAutoRun(
-      HKEY_CURRENT_USER, kAutolaunchKeyValue, &autolaunch)) {
+      HKEY_CURRENT_USER, key_name, &autolaunch)) {
     return false;
   }
 
@@ -37,7 +73,11 @@
   return autolaunch.find(chrome_exe.value()) != string16::npos;
 }
 
-void SetWillLaunchAtLogin(bool auto_launch, const FilePath& application_path) {
+void SetWillLaunchAtLogin(bool auto_launch,
+                          const FilePath& application_path,
+                          const string16& profile_directory) {
+  string16 key_name(ProfileToKeyName(profile_directory));
+
   // TODO(finnur): Convert this into a shortcut, instead of using the Run key.
   if (auto_launch) {
     FilePath path(application_path);
@@ -54,10 +94,26 @@
     cmd_line += ASCIIToUTF16("\" --");
     cmd_line += ASCIIToUTF16(switches::kAutoLaunchAtStartup);
 
+    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    if (command_line.HasSwitch(switches::kUserDataDir)) {
+      cmd_line += ASCIIToUTF16(" --");
+      cmd_line += ASCIIToUTF16(switches::kUserDataDir);
+      cmd_line += ASCIIToUTF16("=\"");
+      cmd_line +=
+          command_line.GetSwitchValuePath(switches::kUserDataDir).value();

[grt (UTC plus 2), 2012/02/07 16:36:04]

how about this to avoid the string -> FilePath -> string conversions:
cmd_line += command_line.GetSwitchValueNative(switches::kUserDataDir);

[Finnur, 2012/02/07 18:20:30]

Sure. I'll do that first thing tomorrow morning.

 On 2012/02/07 16:36:04, grt wrote:

+      cmd_line += ASCIIToUTF16("\"");
+    }
+
+    cmd_line += ASCIIToUTF16(" --");
+    cmd_line += ASCIIToUTF16(switches::kProfileDirectory);
+    cmd_line += ASCIIToUTF16("=\"");
+    cmd_line += profile_directory;
+    cmd_line += ASCIIToUTF16("\"");
+
     base::win::AddCommandToAutoRun(
-        HKEY_CURRENT_USER, kAutolaunchKeyValue, cmd_line);
+        HKEY_CURRENT_USER, key_name, cmd_line);
   } else {
-    base::win::RemoveCommandFromAutoRun(HKEY_CURRENT_USER, kAutolaunchKeyValue);
+    base::win::RemoveCommandFromAutoRun(HKEY_CURRENT_USER, key_name);
   }
 }