Remove content::URLFetcherDelegate

chrome/common/net/gaia/gaia_auth_fetcher_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.
 //
 // A complete set of unit tests for GaiaAuthFetcher.
 // Originally ported from GoogleAuthenticator tests.
 
 #include <string>
 
 #include "base/json/json_reader.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/net/gaia/mock_url_fetcher_factory.h"
 #include "chrome/test/base/testing_profile.h"
-#include "content/public/common/url_fetcher_delegate.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
+#include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::Invoke;
 
 namespace {
 static const char kGetAuthCodeValidCookie[] =
     "oauth_code=test-code; Path=/test; Secure; HttpOnly";
@@ skipping 42 matching lines @@
   EXPECT_EQ("alternate_text", error.second_factor().alternate_text);
   EXPECT_EQ(10, error.second_factor().field_length);
 }
 
 }  // namespace
 
 MockFetcher::MockFetcher(bool success,
                          const GURL& url,
                          const std::string& results,
                          content::URLFetcher::RequestType request_type,
-                         content::URLFetcherDelegate* d)
+                         net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
   net::URLRequestStatus::Status code;
   
   if (success) {
     set_response_code(net::HTTP_OK);
     code = net::URLRequestStatus::SUCCESS;
   } else {
     set_response_code(net::HTTP_FORBIDDEN);
     code = net::URLRequestStatus::FAILED;
   }
 
   set_status(net::URLRequestStatus(code, 0));
   SetResponseString(results);
 }
 
 MockFetcher::MockFetcher(const GURL& url,
                          const net::URLRequestStatus& status,
                          int response_code,
                          const net::ResponseCookies& cookies,
                          const std::string& results,
                          content::URLFetcher::RequestType request_type,
-                         content::URLFetcherDelegate* d)
+                         net::URLFetcherDelegate* d)
     : TestURLFetcher(0, url, d) {
   set_url(url);
   set_status(status);
   set_response_code(response_code);
   set_cookies(cookies);
   SetResponseString(results);
 }
 
 MockFetcher::~MockFetcher() {}
 
@@ skipping 903 matching lines @@
       .Times(1);
 
   GaiaAuthFetcher auth(&consumer, std::string(),
       profile_.GetRequestContext());
   net::URLRequestStatus status(net::URLRequestStatus::SUCCESS, 0);
   MockFetcher mock_fetcher(
       oauth_login_gurl_, status, net::HTTP_OK, cookies_, data,
       content::URLFetcher::GET, &auth);
   auth.OnURLFetchComplete(&mock_fetcher);
 }