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

chrome/browser/ui/webui/options2/browser_options_handler2.cc

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
===================================================================
--- chrome/browser/ui/webui/options2/browser_options_handler2.cc	(revision 132169)
+++ chrome/browser/ui/webui/options2/browser_options_handler2.cc	(working copy)
@@ -648,9 +648,10 @@
       base::Bind(&BrowserOptionsHandler::CheckAutoLaunchCallback,
                  weak_this,
                  auto_launch_trial::IsInAutoLaunchGroup(),
-                 auto_launch_util::WillLaunchAtLogin(
+                 auto_launch_util::WillLaunchAtLoginWithSwitch(
                      FilePath(),
-                     profile_path.BaseName().value())));
+                     profile_path.BaseName().value(),
+                     switches::kAutoLaunchAtStartup)));
 #endif
 }
 
@@ -883,8 +884,11 @@
   Profile* profile = Profile::FromWebUI(web_ui());
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
-      base::Bind(&auto_launch_util::SetWillLaunchAtLogin, enable,
-                 FilePath(), profile->GetPath().BaseName().value()));
+      base::Bind(&auto_launch_util::SetWillLaunchAtLogin,
+                 FilePath(), profile->GetPath().BaseName().value(),
+                 enable ? auto_launch_util::FLAG_ENABLE :  // Auto-launch.
+                          auto_launch_util::FLAG_DISABLE,
+                 auto_launch_util::FLAG_PRESERVE));  // Background mode.
 #endif  // OS_WIN
 }