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

chrome/browser/net/gaia/gaia_oauth_fetcher_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.
 //
 // A complete set of unit tests for GaiaOAuthFetcher.
 // Originally ported from GaiaAuthFetcher tests.
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 142 matching lines @@
                                      "service_scope-JnG18MEE");
   EXPECT_CALL(oauth_fetcher,
               StartOAuthWrapBridge(oauth_token,
                                    oauth_token_secret,
                                    "3600",
                                    "service_scope-JnG18MEE")).Times(1);
 
   net::ResponseCookies cookies;
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_get_access_token_url());
-  oauth_fetcher.OnURLFetchComplete(NULL, url, status, RC_REQUEST_OK,
-                                   cookies, data);
+
+  TestURLFetcher test_fetcher(0, GURL(), URLFetcher::GET, &oauth_fetcher);
+  test_fetcher.set_url(url);
+  test_fetcher.set_status(status);
+  test_fetcher.set_response_code(RC_REQUEST_OK);
+  test_fetcher.set_cookies(cookies);
+  test_fetcher.SetResponseString(data);
+  oauth_fetcher.OnURLFetchComplete(&test_fetcher);
 }
 
 TEST_F(GaiaOAuthFetcherTest, OAuthWrapBridge) {
   const std::string wrap_token =
       "1/OAuth2-Access_Token-nopqrstuvwxyz1234567890";
   const std::string expires_in = "3600";
 
   const std::string data("wrap_access_token="
                          "1%2FOAuth2-Access_Token-nopqrstuvwxyz1234567890"
                          "&wrap_access_token_expires_in=3600");
 
   MockGaiaOAuthConsumer consumer;
   EXPECT_CALL(consumer,
               OnOAuthWrapBridgeSuccess("service_scope-0fL85iOi",
                                        wrap_token,
                                        expires_in)).Times(1);
 
   TestingProfile profile;
   MockGaiaOAuthFetcher oauth_fetcher(&consumer,
                                      profile.GetRequestContext(),
                                      &profile,
                                      "service_scope-0fL85iOi");
   EXPECT_CALL(oauth_fetcher, StartUserInfo(wrap_token)).Times(1);
 
   net::ResponseCookies cookies;
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_wrap_bridge_url());
-  oauth_fetcher.OnURLFetchComplete(NULL, url, status, RC_REQUEST_OK,
-                                   cookies, data);
+
+  TestURLFetcher test_fetcher(0, GURL(), URLFetcher::GET, &oauth_fetcher);
+  test_fetcher.set_url(url);
+  test_fetcher.set_status(status);
+  test_fetcher.set_response_code(RC_REQUEST_OK);
+  test_fetcher.set_cookies(cookies);
+  test_fetcher.SetResponseString(data);
+  oauth_fetcher.OnURLFetchComplete(&test_fetcher);
 }
 
 TEST_F(GaiaOAuthFetcherTest, UserInfo) {
   const std::string email_address = "someone@somewhere.net";
   const std::string wrap_token =
       "1/OAuth2-Access_Token-nopqrstuvwxyz1234567890";
   const std::string expires_in = "3600";
   const std::string data("{\n \"email\": \"someone@somewhere.net\",\n"
                          " \"verified_email\": true\n}\n");
   MockGaiaOAuthConsumer consumer;
   EXPECT_CALL(consumer,
               OnUserInfoSuccess(email_address)).Times(1);
 
   TestingProfile profile;
   MockGaiaOAuthFetcher oauth_fetcher(&consumer,
                                      profile.GetRequestContext(),
                                      &profile,
                                      "service_scope-Nrj4LmgU");
 
   net::ResponseCookies cookies;
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_user_info_url());
-  oauth_fetcher.OnURLFetchComplete(NULL, url, status,
-                                   RC_REQUEST_OK, cookies, data);
+
+  TestURLFetcher test_fetcher(0, GURL(), URLFetcher::GET, &oauth_fetcher);
+  test_fetcher.set_url(url);
+  test_fetcher.set_status(status);
+  test_fetcher.set_response_code(RC_REQUEST_OK);
+  test_fetcher.set_cookies(cookies);
+  test_fetcher.SetResponseString(data);
+  oauth_fetcher.OnURLFetchComplete(&test_fetcher);
 }
 
 TEST_F(GaiaOAuthFetcherTest, OAuthRevokeToken) {
   const std::string token = "1/OAuth2-Access_Token-nopqrstuvwxyz1234567890";
   MockGaiaOAuthConsumer consumer;
   EXPECT_CALL(consumer,
               OnOAuthRevokeTokenSuccess()).Times(1);
 
   TestingProfile profile;
   MockGaiaOAuthFetcher oauth_fetcher(&consumer,
                                      profile.GetRequestContext(),
                                      &profile,
                                      "service_scope-Nrj4LmgU");
 
   net::ResponseCookies cookies;
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   GURL url(GaiaUrls::GetInstance()->oauth_revoke_token_url());
-  oauth_fetcher.OnURLFetchComplete(NULL, url, status,
-                                   RC_REQUEST_OK, cookies, std::string());
+
+  TestURLFetcher test_fetcher(0, GURL(), URLFetcher::GET, &oauth_fetcher);
+  test_fetcher.set_url(url);
+  test_fetcher.set_status(status);
+  test_fetcher.set_response_code(RC_REQUEST_OK);
+  test_fetcher.set_cookies(cookies);
+  oauth_fetcher.OnURLFetchComplete(&test_fetcher);
 }