Reland 203015 "Add ManagedUserTokenFetcher to fetch scoped-down ..."

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
index dadb7a9efc952146c906576c7143f980bd94ebdb..66002748c524ae91c2012aeeaeed2ea122635b43 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc
@@ -324,10 +324,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
     if (robot_auth_fetch_status_ == DM_STATUS_SUCCESS) {
       net::TestURLFetcher* url_fetcher = url_fetcher_factory_.GetFetcherByID(0);
       ASSERT_TRUE(url_fetcher);
-      // The logic in GaiaOAuthClient seems broken, it always retries 1x on
-      // non-200 response codes, even if the retries are set to 0.  Seems like
-      // its num_retries_ > source->GetMaxRetriesOn5xx() should have a >=?
-      url_fetcher->SetMaxRetriesOn5xx(-2);
+      url_fetcher->SetMaxRetriesOn5xx(0);
       url_fetcher->set_status(net::URLRequestStatus());
       url_fetcher->set_response_code(url_fetcher_response_code_);
       url_fetcher->SetResponseString(url_fetcher_response_string_);