OAuth2 sign-in flow for ChromeOS

chrome/browser/chromeos/preferences.cc

Index: chrome/browser/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index f7df26a0ed5fc711dfd82a788bafb9a1a6cc69f1..cea52a6a48d2e11ad7a5f978572e16d23dd7b80a 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -276,13 +276,15 @@ void Preferences::RegisterUserPrefs(PrefServiceSyncable* prefs) {
                             "0.0.0.0",
                             PrefServiceSyncable::SYNCABLE_PREF);
 
-  // OAuth1 all access token and secret pair.
-  prefs->RegisterStringPref(prefs::kOAuth1Token,
-                            "",
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
-  prefs->RegisterStringPref(prefs::kOAuth1Secret,
-                            "",
-                            PrefServiceSyncable::UNSYNCABLE_PREF);
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kForceOAuth2)) {
+    // Legacy OAuth1 all access token and secret pair.
+    prefs->RegisterStringPref(prefs::kOAuth1Token,
+                              "",
+                              PrefServiceSyncable::UNSYNCABLE_PREF);
+    prefs->RegisterStringPref(prefs::kOAuth1Secret,
+                              "",
+                              PrefServiceSyncable::UNSYNCABLE_PREF);
+  }
 
   // TODO(wad): Once UI is connected, a final default can be set. At that point
   // change this pref from UNSYNCABLE to SYNCABLE.