Split the about flags for pre- and auto-login apart, and leave pre-login

enabled by default and make auto-login disabled by default.

BUG=None
TEST=Try all four combinations of the about flags to make sure they work
as expected.

Review URL: http://codereview.chromium.org/7401021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93032 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 34 insertions, 14 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cfde9af..5fb5f9b 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4352,12 +4352,20 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_SMOOTH_SCROLLING_DESCRIPTION" desc="Description for the flag to turn on smooth scrolling">
         Enable the experimental smooth scrolling implementation.
       </message>
-      <message name="IDS_FLAGS_AUTO_LOGIN_NAME" desc="title for the flag to pre- and auto-login the user">
-        Disable pre- and auto-login
+      <message name="IDS_FLAGS_PRE_LOGIN_NAME" desc="Title for the flag to pre-login the user">
+        Turn off pre-login
       </message>
-      <message name="IDS_FLAGS_AUTO_LOGIN_DESCRIPTION" desc="Description for the flag to pre- and auto-login the user">
-        Disable pre-login to services when sync is enabled.  Also disable infobar on login pages which help automate the login process.
-        Pre- and auto-login are always disabled if sync is disabled.
+      <message name="IDS_FLAGS_PRE_LOGIN_DESCRIPTION" desc="Description for the flag to pre-login the user">
+        When pre-login is turned on, connecting a profile to a Google Account will add the account's cookies
+        to the profile's cookie jar, so that retyping the username and password in the browser is not necessary.
+        Pre-login is always disabled if the profile is not connected to a Google Account.
+      </message>
+      <message name="IDS_FLAGS_AUTO_LOGIN_NAME" desc="Title for the flag to auto-login the user">
+        Auto-login
+      </message>
+      <message name="IDS_FLAGS_AUTO_LOGIN_DESCRIPTION" desc="Description for the flag to auto-login the user">
+        When auto-login is enabled, an infobar will appear on Google Account login pages to help with the login process.
+        Auto-login is always disabled if the profile is not connected to a Google Account.
       </message>
       <message name="IDS_FLAGS_SHOW_AUTOFILL_TYPE_PREDICTIONS_NAME" desc="Title for the flag to show Autofill field type predictions for all forms">
         Show Autofill predictions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 0ec0912..03cd23c 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -301,11 +301,18 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(switches::kPreloadInstantSearch)
   },
   {
-    "disable-auto-login",
+    "enable-auto-login",
     IDS_FLAGS_AUTO_LOGIN_NAME,
     IDS_FLAGS_AUTO_LOGIN_DESCRIPTION,
     kOsMac | kOsWin | kOsLinux,
-    SINGLE_VALUE_TYPE(switches::kDisableAutoLogin)
+    SINGLE_VALUE_TYPE(switches::kEnableAutoLogin)
+  },
+  {
+    "disable-pre-login",
+    IDS_FLAGS_PRE_LOGIN_NAME,
+    IDS_FLAGS_PRE_LOGIN_DESCRIPTION,
+    kOsMac | kOsWin | kOsLinux,
+    SINGLE_VALUE_TYPE(switches::kDisablePreLogin)
   },
   {
     "static-ip-config",
diff --git a/chrome/browser/sync/signin_manager.cc b/chrome/browser/sync/signin_manager.cc
index 1ecd9cd..ee72dd2 100644
--- a/chrome/browser/sync/signin_manager.cc
+++ b/chrome/browser/sync/signin_manager.cc
@@ -91,7 +91,7 @@ void SigninManager::StartSignIn(const std::string& username,
   // are not running in ChomiumOS, since it handles pre-login itself.
 #if !defined(OS_CHROMEOS)
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableAutoLogin)) {
+      switches::kDisablePreLogin)) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_TOKEN_AVAILABLE,
                    NotificationService::AllSources());
diff --git a/chrome/browser/ui/autologin_infobar_delegate.cc b/chrome/browser/ui/autologin_infobar_delegate.cc
index 1048f68..03fa7c7 100644
--- a/chrome/browser/ui/autologin_infobar_delegate.cc
+++ b/chrome/browser/ui/autologin_infobar_delegate.cc
@@ -137,7 +137,7 @@ void AutoLoginInfoBarDelegate::ShowIfAutoLoginRequested(
     net::URLRequest* request,
     int child_id,
     int route_id) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableAutoLogin))
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAutoLogin))
     return;
 
   // See if the response contains the X-Auto-Login header.  If so, this was
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index dddaded..002d49d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -196,10 +196,6 @@ const char kDiagnostics[]                   = "diagnostics";
 const char kDisableAuthNegotiateCnameLookup[] =
     "disable-auth-negotiate-cname-lookup";
 
-// Disable both pre- and auto-login for services attached to a GAIA account
-// even when the GAIA credentials are available through sync.
-const char kDisableAutoLogin[]              = "disable-auto-login";
-
 // Disable background mode (background apps will not keep chrome running in the
 // background).
 const char kDisableBackgroundMode[] = "disable-background-mode";
@@ -269,6 +265,10 @@ const char kDisableIPPooling[]              = "disable-ip-pooling";
 // Disable speculative TCP/IP preconnection.
 const char kDisablePreconnect[]             = "disable-preconnect";
 
+// Disable pre-login for services attached to a GAIA account even when the
+// GAIA credentials are available through sync.
+const char kDisablePreLogin[]               = "disable-pre-login";
+
 // Whether we should prevent the new tab page from showing the first run
 // notification.
 const char kDisableNewTabFirstRun[]         = "disable-new-tab-first-run";
@@ -384,6 +384,10 @@ const char kEnableAuthNegotiatePort[]       = "enable-auth-negotiate-port";
 // automatically due to privacy concerns.
 const char kEnableAutofillFeedback[]        = "enable-autofill-feedback";
 
+// Enable auto-login for services attached to a GAIA account even when the GAIA
+// credentials are available through sync.
+const char kEnableAutoLogin[]               = "enable-auto-login";
+
 // This flag enables UI for clearing server data.  Temporarily in place
 // until there's a server endpoint deployed.
 const char kEnableClearServerData[]         = "enable-clear-server-data";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 5cb8269..c103971 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -65,7 +65,6 @@ extern const char kDebugPrint[];
 extern const char kDeviceManagementUrl[];
 extern const char kDiagnostics[];
 extern const char kDisableAuthNegotiateCnameLookup[];
-extern const char kDisableAutoLogin[];
 extern const char kDisableBackgroundMode[];
 extern const char kDisableBackgroundNetworking[];
 extern const char kDisableClientSidePhishingDetection[];
@@ -84,6 +83,7 @@ extern const char kDisableIPv6[];
 extern const char kDisableIPPooling[];
 extern const char kDisableNewTabFirstRun[];
 extern const char kDisablePreconnect[];
+extern const char kDisablePreLogin[];
 extern const char kDisablePromptOnRepost[];
 extern const char kDisableRemoteFonts[];
 extern const char kDisableRestoreBackgroundContents[];
@@ -113,6 +113,7 @@ extern const char kDumpHistogramsOnExit[];
 extern const char kEnableAeroPeekTabs[];
 extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableAutofillFeedback[];
+extern const char kEnableAutoLogin[];
 extern const char kEnableClearServerData[];
 extern const char kEnableClickToPlay[];
 extern const char kEnableCloudPrintProxy[];