Revert "Remove desktop auto-login since we don't plan on shipping it there. Refactor the base and …

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 100d8443ab03106ad2dd4fffb619a3a3477d35e2..e8cb7f93a7f2da20f2ca1ac92ba3b7c5e59494bc 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -486,6 +486,11 @@ const char kEnableAsyncDns[]                = "enable-async-dns";
 // HttpAuthHandlerNegotiate::CreateSPN for more background.
 const char kEnableAuthNegotiatePort[]       = "enable-auth-negotiate-port";
 
+// Enables the pre- and auto-login features. When a user signs in to sync, the
+// browser's cookie jar is pre-filled with GAIA cookies. When the user visits a
+// GAIA login page, an info bar can help the user login.
+const char kEnableAutologin[]               = "enable-autologin";
+
 // Enables the Automation extension API.
 // TODO(dtseng): Remove once API enabled for stable channel.
 const char kEnableAutomationAPI[]           = "enable-automation-api";