Index: chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc |
=================================================================== |
--- chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc (revision 107061) |
+++ chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc (working copy) |
@@ -77,7 +77,7 @@ |
// CloudPrintURLFetcher::Delegate |
virtual CloudPrintURLFetcher::ResponseAction HandleRawResponse( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const net::URLRequestStatus& status, |
int response_code, |
@@ -125,7 +125,7 @@ |
: handle_raw_response_(false), handle_raw_data_(false) { } |
// CloudPrintURLFetcher::Delegate |
virtual CloudPrintURLFetcher::ResponseAction HandleRawResponse( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const net::URLRequestStatus& status, |
int response_code, |
@@ -133,12 +133,12 @@ |
const std::string& data); |
virtual CloudPrintURLFetcher::ResponseAction HandleRawData( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const std::string& data); |
virtual CloudPrintURLFetcher::ResponseAction HandleJSONData( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
DictionaryValue* json_data, |
bool succeeded); |
@@ -162,7 +162,7 @@ |
// CloudPrintURLFetcher::Delegate |
virtual CloudPrintURLFetcher::ResponseAction HandleRawData( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const std::string& data); |
@@ -178,7 +178,7 @@ |
// CloudPrintURLFetcher::Delegate |
virtual CloudPrintURLFetcher::ResponseAction HandleRawData( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const std::string& data); |
@@ -198,7 +198,7 @@ |
CloudPrintURLFetcher::ResponseAction |
CloudPrintURLFetcherTest::HandleRawResponse( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const net::URLRequestStatus& status, |
int response_code, |
@@ -212,7 +212,7 @@ |
CloudPrintURLFetcher::ResponseAction |
CloudPrintURLFetcherBasicTest::HandleRawResponse( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const net::URLRequestStatus& status, |
int response_code, |
@@ -233,7 +233,7 @@ |
CloudPrintURLFetcher::ResponseAction |
CloudPrintURLFetcherBasicTest::HandleRawData( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
const std::string& data) { |
// We should never get here if we returned true in HandleRawResponse |
@@ -247,7 +247,7 @@ |
CloudPrintURLFetcher::ResponseAction |
CloudPrintURLFetcherBasicTest::HandleJSONData( |
- const URLFetcher* source, |
+ const content::URLFetcher* source, |
const GURL& url, |
DictionaryValue* json_data, |
bool succeeded) { |
@@ -259,9 +259,10 @@ |
} |
CloudPrintURLFetcher::ResponseAction |
-CloudPrintURLFetcherOverloadTest::HandleRawData(const URLFetcher* source, |
- const GURL& url, |
- const std::string& data) { |
+CloudPrintURLFetcherOverloadTest::HandleRawData( |
+ const content::URLFetcher* source, |
+ const GURL& url, |
+ const std::string& data) { |
const TimeDelta one_second = TimeDelta::FromMilliseconds(1000); |
response_count_++; |
if (response_count_ < 20) { |
@@ -279,9 +280,10 @@ |
} |
CloudPrintURLFetcher::ResponseAction |
-CloudPrintURLFetcherRetryBackoffTest::HandleRawData(const URLFetcher* source, |
- const GURL& url, |
- const std::string& data) { |
+CloudPrintURLFetcherRetryBackoffTest::HandleRawData( |
+ const content::URLFetcher* source, |
+ const GURL& url, |
+ const std::string& data) { |
response_count_++; |
// First attempt + 11 retries = 12 total responses. |
EXPECT_LE(response_count_, 12); |