Resolve the conflict that auto-launch has with the background mode feature (part 1).

chrome/browser/profiles/profile_shortcut_manager_win.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/profiles/profile_shortcut_manager_win.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 190 matching lines @@
       shortcut_path.value(),
       arguments,
       description,
       icon_path.empty() ? chrome_exe.value() : icon_path.value(),
       icon_path.empty() ? dist->GetIconIndex() : 0,
       ShellUtil::SHORTCUT_NO_OPTIONS);
 }
 
 void DeleteAutoLaunchValueForProfile(
     const FilePath& profile_path) {
-  if (auto_launch_util::WillLaunchAtLogin(FilePath(),
-                                          profile_path.BaseName().value())) {
-      auto_launch_util::SetWillLaunchAtLogin(
-          false, FilePath(), profile_path.BaseName().value());
+  if (auto_launch_util::WillLaunchAtLoginWithSwitch(

[grt (UTC plus 2), 2012/04/16 19:43:58]

can you do away with the "WithSwitch" part of this, too?

+      FilePath(),
+      profile_path.BaseName().value(),
+      switches::kAutoLaunchAtStartup)) {
+    auto_launch_util::DisableAutoStartAtLogin(profile_path.BaseName().value());
   }
 }
 
 }  // namespace
 
 ProfileShortcutManagerWin::ProfileShortcutManagerWin() {
 }
 
 ProfileShortcutManagerWin::~ProfileShortcutManagerWin() {
 }
@@ skipping 196 matching lines @@
   shortcuts.reserve(profile_names.size());
   for (std::vector<string16>::const_iterator it = profile_names.begin();
        it != profile_names.end();
        ++it) {
     string16 shortcut;
     if (ShellUtil::GetChromeShortcutName(dist, false, *it, &shortcut))
       shortcuts.push_back(shortcut);
   }
   return shortcuts;
 }