Remove content::URLFetcherDelegate

chrome/common/net/gaia/oauth2_api_call_flow_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 OAuth2MintTokenFlow.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/net/gaia/gaia_urls.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/net/gaia/oauth2_access_token_consumer.h"
 #include "chrome/common/net/gaia/oauth2_access_token_fetcher.h"
 #include "chrome/common/net/gaia/oauth2_api_call_flow.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/common/url_fetcher.h"
-#include "content/public/common/url_fetcher_delegate.h"
 #include "content/public/common/url_fetcher_factory.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_status_code.h"
+#include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using content::URLFetcher;
-using content::URLFetcherDelegate;
 using content::URLFetcherFactory;
 using net::HttpRequestHeaders;
+using net::URLFetcher;
+using net::URLFetcherDelegate;
 using net::URLRequestStatus;
 using testing::_;
 using testing::Return;
 
 namespace {
 
 static std::string CreateBody() {
   return "some body";
 }
 
@@ skipping 11 matching lines @@
 class MockUrlFetcherFactory : public ScopedURLFetcherFactory,
                               public URLFetcherFactory {
  public:
   MockUrlFetcherFactory()
       : ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   }
   virtual ~MockUrlFetcherFactory() {}
 
   MOCK_METHOD4(
       CreateURLFetcher,
-      URLFetcher* (int id,
-                   const GURL& url,
-                   URLFetcher::RequestType request_type,
-                   URLFetcherDelegate* d));
+      content::URLFetcher* (int id,
+                            const GURL& url,
+                            URLFetcher::RequestType request_type,
+                            URLFetcherDelegate* d));
 };
 
 class MockAccessTokenFetcher : public OAuth2AccessTokenFetcher {
  public:
   MockAccessTokenFetcher(OAuth2AccessTokenConsumer* consumer,
                          net::URLRequestContextGetter* getter)
       : OAuth2AccessTokenFetcher(consumer, getter) {}
   ~MockAccessTokenFetcher() {}
 
   MOCK_METHOD4(Start,
@@ skipping 204 matching lines @@
   scoped_ptr<TestURLFetcher> url_fetcher(SetupApiCall(true, net::HTTP_OK));
   flow_->CreateURLFetcher();
   HttpRequestHeaders headers;
   url_fetcher->GetExtraRequestHeaders(&headers);
   std::string auth_header;
   EXPECT_TRUE(headers.GetHeader("Authorization", &auth_header));
   EXPECT_EQ("Bearer access_token", auth_header);
   EXPECT_EQ(url, url_fetcher->GetOriginalURL());
   EXPECT_EQ(body, url_fetcher->upload_data());
 }