OAuth2 sign-in flow for ChromeOS

chrome/browser/chromeos/login/login_utils_browsertest.cc

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc
index 4db5e0138059d75e59d48c887ed87d0ad58f4006..94bd3084e83bc63bf4fcbf326d5174dc7da5f4bb 100644
--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc
+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc
@@ -182,6 +182,9 @@ class LoginUtilsTest : public testing::Test,
     CommandLine* command_line = CommandLine::ForCurrentProcess();
     command_line->AppendSwitchASCII(switches::kDeviceManagementUrl, kDMServer);
     command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
+    // TODO(mnissler): Figure out how to beat this test into submission on
+    // OAuth2 path.
+    command_line->AppendSwitch(switches::kForceOAuth1);
 
     local_state_.Get()->RegisterStringPref(prefs::kApplicationLocale, "");
 
@@ -400,14 +403,12 @@ class LoginUtilsTest : public testing::Test,
                                  username,
                                  "password");
 
-    const bool kPendingRequests = false;
     const bool kUsingOAuth = true;
     // Setting |kHasCookies| to false prevents ProfileAuthData::Transfer from
     // waiting for an IO task before proceeding.
     const bool kHasCookies = false;
     LoginUtils::Get()->PrepareProfile(username, std::string(), "password",
-                                      kPendingRequests, kUsingOAuth,
-                                      kHasCookies, this);
+                                      kUsingOAuth, kHasCookies, this);
     device_settings_test_helper.Flush();
     RunUntilIdle();
   }