Reverting 267374 on 36 branch.

chrome/browser/policy/cloud/user_policy_signin_service_unittest.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 "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
@@ skipping 18 matching lines @@
 #include "components/policy/core/common/cloud/mock_user_cloud_policy_store.h"
 #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
 #include "components/policy/core/common/schema_registry.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
-#include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_ANDROID)
@@ skipping 18 matching lines @@
 const char kValidTokenResponse[] =
     "{"
     "  \"access_token\": \"at1\","
     "  \"expires_in\": 3600,"
     "  \"token_type\": \"Bearer\""
     "}";
 #endif
 
 const char kHostedDomainResponse[] =
     "{"
-    "  \"domain\": \"test.com\""
+    "  \"hd\": \"test.com\""
     "}";
 
 class SigninManagerFake : public FakeSigninManager {
  public:
   explicit SigninManagerFake(Profile* profile)
       : FakeSigninManager(profile) {
     Initialize(NULL);
   }
 
   void ForceSignOut() {
@@ skipping 136 matching lines @@
         content::Source<Profile>(profile_.get()),
         content::NotificationService::NoDetails());
   }
 
   FakeProfileOAuth2TokenService* GetTokenService() {
     ProfileOAuth2TokenService* service =
         ProfileOAuth2TokenServiceFactory::GetForProfile(profile_.get());
     return static_cast<FakeProfileOAuth2TokenService*>(service);
   }
 
-  // Returns true if a request for policy information is active.  A request
-  // is considered active if there is an active fetcher for an access token
-  // hosted domain information (i.e. the gaia oauth client) or some other
-  // fecther used in the code (id 0).
   bool IsRequestActive() {
     if (!GetTokenService()->GetPendingRequests().empty())
       return true;
-    return url_factory_.GetFetcherByID(0) ||
-        url_factory_.GetFetcherByID(gaia::GaiaOAuthClient::kUrlFetcherId);
+    return url_factory_.GetFetcherByID(0);
   }
 
   void MakeOAuthTokenFetchSucceed() {
     ASSERT_TRUE(IsRequestActive());
 #if defined(OS_ANDROID)
     GetTokenService()->IssueTokenForAllPendingRequests("access_token",
                                                        base::Time::Now());
 #else
     net::TestURLFetcher* fetcher = url_factory_.GetFetcherByID(0);
     fetcher->set_response_code(net::HTTP_OK);
     fetcher->SetResponseString(kValidTokenResponse);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
 #endif
   }
 
   void ReportHostedDomainStatus(bool is_hosted_domain) {
     ASSERT_TRUE(IsRequestActive());
-    net::TestURLFetcher* fetcher =
-        url_factory_.GetFetcherByID(gaia::GaiaOAuthClient::kUrlFetcherId);
+    net::TestURLFetcher* fetcher = url_factory_.GetFetcherByID(0);
     fetcher->set_response_code(net::HTTP_OK);
     fetcher->SetResponseString(is_hosted_domain ? kHostedDomainResponse : "{}");
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   void TestSuccessfulSignin() {
     UserPolicySigninService* signin_service =
         UserPolicySigninServiceFactory::GetForProfile(profile_.get());
     EXPECT_CALL(*this, OnPolicyRefresh(true)).Times(0);
     RegisterPolicyClientWithCallback(signin_service);
@@ skipping 539 matching lines @@
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(manager_->IsClientRegistered());
 #if !defined(OS_ANDROID)
   EXPECT_FALSE(signin_manager_->IsSignoutProhibited());
 #endif
 }
 
 }  // namespace
 
 }  // namespace policy