| Index: chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc
|
| diff --git a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc b/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc
|
| index f0bc10b5b2486fbc610145e19f62d03945e1a85b..b36b185e3957323f6680441d849815c9721d12ed 100644
|
| --- a/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc
|
| +++ b/chrome/common/net/gaia/oauth2_api_call_flow_unittest.cc
|
| @@ -15,20 +15,20 @@
|
| #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;
|
| @@ -60,10 +60,10 @@ class MockUrlFetcherFactory : public ScopedURLFetcherFactory,
|
|
|
| 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 {
|
|
|