| Index: chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc
|
| diff --git a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc b/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc
|
| index 56b2ce2c5762e4e9d37c5f4b6cb01ce7c095d3ee..4c079a95b9d81095262799c7cc78e97ba811ff5a 100644
|
| --- a/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc
|
| +++ b/chrome/common/net/gaia/oauth2_mint_token_fetcher_unittest.cc
|
| @@ -15,22 +15,22 @@
|
| #include "chrome/common/net/gaia/oauth2_mint_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;
|
| @@ -57,10 +57,10 @@ public:
|
|
|
| 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 MockOAuth2MintTokenConsumer : public OAuth2MintTokenConsumer {
|
|
|