Use OAuth2 token for sync

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 18 matching lines @@
   if (!command_line->HasSwitch(switch_string))
     command_line->AppendSwitchASCII(switch_string, value);
 }
 
 }  // namespace
 
 void SetChromeSpecificCommandLineFlags() {
   // Turn on autologin.
   SetCommandLineSwitch(switches::kEnableAutologin);
 
+  // Use ClientLogin token on android.
+  // TODO(pavely): Remove once sync on android uses oauth2 tokens.
+  SetCommandLineSwitch(switches::kSyncDisableOAuth2Token);
+
   // Enable prerender for the omnibox.
   SetCommandLineSwitchASCII(
       switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled);
   SetCommandLineSwitchASCII(
       switches::kPrerenderFromOmnibox,
       switches::kPrerenderFromOmniboxSwitchValueEnabled);
 #if defined(GOOGLE_TV)
   SetCommandLineSwitch(switches::kPpapiInProcess);
 #endif
 }