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

chrome/browser/android/chrome_startup_flags.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 <jni.h>
 
 #include "chrome/browser/android/chrome_startup_flags.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 17 matching lines @@
 void SetCommandLineSwitchASCII(const std::string& switch_string,
                                const std::string& value) {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switch_string))
     command_line->AppendSwitchASCII(switch_string, value);
 }
 
 }  // namespace
 
 void SetChromeSpecificCommandLineFlags() {
+  // Turn on autologin.
+  SetCommandLineSwitch(switches::kEnableAutologin);
+
   // Enable prerender for the omnibox.
   SetCommandLineSwitchASCII(switches::kPrerenderMode,
                             switches::kPrerenderModeSwitchValueEnabled);
   SetCommandLineSwitchASCII(switches::kPrerenderFromOmnibox,
                             switches::kPrerenderFromOmniboxSwitchValueEnabled);
 
   // Disable syncing favicons on low end devices.
   if (base::android::SysUtils::IsLowEndDevice())
     SetCommandLineSwitchASCII(switches::kDisableSyncTypes, "Favicon Images");
 
   // Enable DOM Distiller on local builds, canary and dev-channel.
   chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
   if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN ||
       channel == chrome::VersionInfo::CHANNEL_CANARY ||
       channel == chrome::VersionInfo::CHANNEL_DEV) {
     SetCommandLineSwitch(switches::kEnableDomDistiller);
   }
 
   // Enable the Fast Text Autosizer on local builds, canary and dev-channel.
   if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN ||
       channel == chrome::VersionInfo::CHANNEL_CANARY ||
       channel == chrome::VersionInfo::CHANNEL_DEV) {
     SetCommandLineSwitch(switches::kEnableFastTextAutosizing);
   }
 }