Remove content::URLFetcherDelegate

chrome/common/net/gaia/oauth2_access_token_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 OAuth2AccessTokenFetcher.
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.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/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_browser_thread.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "googleurl/src/gurl.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::BrowserThread;
-using content::URLFetcher;
-using content::URLFetcherDelegate;
 using content::URLFetcherFactory;
 using net::ResponseCookies;
+using net::URLFetcher;
+using net::URLFetcherDelegate;
 using net::URLRequestStatus;
 using testing::_;
 using testing::Return;
 
 namespace {
 
 typedef std::vector<std::string> ScopeList;
 
 static const char kValidTokenResponse[] =
     "{"
@@ skipping 10 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 MockOAuth2AccessTokenConsumer : public OAuth2AccessTokenConsumer {
  public:
   MockOAuth2AccessTokenConsumer() {}
   ~MockOAuth2AccessTokenConsumer() {}
 
   MOCK_METHOD1(OnGetTokenSuccess, void(const std::string& access_token));
   MOCK_METHOD1(OnGetTokenFailure,
                void(const GoogleServiceAuthError& error));
@@ skipping 141 matching lines @@
   {  // Valid json: all good.
     TestURLFetcher url_fetcher(0, GURL("www.google.com"), NULL);
     url_fetcher.SetResponseString(kValidTokenResponse);
 
     std::string at;
     EXPECT_TRUE(OAuth2AccessTokenFetcher::ParseGetAccessTokenResponse(
         &url_fetcher, &at));
     EXPECT_EQ("at1", at);
   }
 }