Convert URLFetcher::Delegates to use an interface in content/public/common. Also remove the old U...

chrome/browser/sync/signin_manager_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/sync/signin_manager.h"
 
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/net/gaia/token_service_unittest.h"
 #include "chrome/browser/password_manager/encryptor.h"
 #include "chrome/browser/sync/util/oauth.h"
@@ skipping 25 matching lines @@
     TokenServiceTestHarness::TearDown();
     browser_sync::SetIsUsingOAuthForTest(originally_using_oauth_);
   }
 
   void SimulateValidResponseClientLogin() {
     DCHECK(!browser_sync::IsUsingOAuth());
     // Simulate the correct ClientLogin response.
     TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
     DCHECK(fetcher);
     DCHECK(fetcher->delegate());
-    fetcher->delegate()->OnURLFetchComplete(
-        fetcher, GURL(GaiaUrls::GetInstance()->client_login_url()),
-        net::URLRequestStatus(), 200, net::ResponseCookies(),
-        "SID=sid\nLSID=lsid\nAuth=auth");
+
+    fetcher->set_url(GURL(GaiaUrls::GetInstance()->client_login_url()));
+    fetcher->set_status(net::URLRequestStatus());
+    fetcher->set_response_code(200);
+    fetcher->SetResponseString("SID=sid\nLSID=lsid\nAuth=auth");
+    fetcher->delegate()->OnURLFetchComplete(fetcher);
 
     // Then simulate the correct GetUserInfo response for the canonical email.
     // A new URL fetcher is used for each call.
     fetcher = factory_.GetFetcherByID(0);
     DCHECK(fetcher);
     DCHECK(fetcher->delegate());
-    fetcher->delegate()->OnURLFetchComplete(
-        fetcher, GURL(GaiaUrls::GetInstance()->get_user_info_url()),
-        net::URLRequestStatus(), 200, net::ResponseCookies(),
-        "email=user@gmail.com");
+    fetcher->set_url(GURL(GaiaUrls::GetInstance()->get_user_info_url()));
+    fetcher->set_status(net::URLRequestStatus());
+    fetcher->set_response_code(200);
+    fetcher->SetResponseString("email=user@gmail.com");
+    fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   void SimulateSigninStartOAuth() {
     DCHECK(browser_sync::IsUsingOAuth());
     // Simulate a valid OAuth-based signin
     manager_->OnGetOAuthTokenSuccess("oauth_token-Ev1Vu1hv");
     manager_->OnOAuthGetAccessTokenSuccess("oauth1_access_token-qOAmlrSM",
                                            "secret-NKKn1DuR");
     manager_->OnOAuthWrapBridgeSuccess(browser_sync::SyncServiceName(),
                                        "oauth2_wrap_access_token-R0Z3nRtw",
@@ skipping 173 matching lines @@
 TEST_F(SigninManagerTest, SignOutOnUserInfoSucessRaceTest) {
   browser_sync::SetIsUsingOAuthForTest(true);
   manager_->Initialize(profile_.get());
   EXPECT_TRUE(manager_->GetUsername().empty());
 
   SimulateSigninStartOAuth();
   manager_->SignOut();
   SimulateOAuthUserInfoSuccess();
   EXPECT_TRUE(manager_->GetUsername().empty());
 }