Merge 176800

chrome/browser/chromeos/login/login_utils_browsertest.cc

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc
===================================================================
--- chrome/browser/chromeos/login/login_utils_browsertest.cc	(revision 177312)
+++ chrome/browser/chromeos/login/login_utils_browsertest.cc	(working copy)
@@ -182,6 +182,9 @@
     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, "");
 
@@ -402,12 +405,10 @@
                                  username,
                                  "password");
 
-    const bool kPendingRequests = false;
     const bool kUsingOAuth = true;
     const bool kHasCookies = true;
     LoginUtils::Get()->PrepareProfile(username, std::string(), "password",
-                                      kPendingRequests, kUsingOAuth,
-                                      kHasCookies, this);
+                                      kUsingOAuth, kHasCookies, this);
     device_settings_test_helper.Flush();
     RunUntilIdle();
   }