| Index: net/url_request/url_request_job_tracker_unittest.cc
|
| diff --git a/net/url_request/url_request_job_tracker_unittest.cc b/net/url_request/url_request_job_tracker_unittest.cc
|
| index 21b72c6eeda60a12d9a29e7a2ddee4afc4a18925..fb257e74dd5d4542923c685c1925eec89f1c1a8b 100644
|
| --- a/net/url_request/url_request_job_tracker_unittest.cc
|
| +++ b/net/url_request/url_request_job_tracker_unittest.cc
|
| @@ -51,27 +51,27 @@ bool GetResponseBody(const GURL& url, std::string* out_body) {
|
|
|
| class MockJobObserver : public URLRequestJobTracker::JobObserver {
|
| public:
|
| - MOCK_METHOD1(OnJobAdded, void(URLRequestJob* job));
|
| - MOCK_METHOD1(OnJobRemoved, void(URLRequestJob* job));
|
| - MOCK_METHOD2(OnJobDone, void(URLRequestJob* job,
|
| + MOCK_METHOD1(OnJobAdded, void(net::URLRequestJob* job));
|
| + MOCK_METHOD1(OnJobRemoved, void(net::URLRequestJob* job));
|
| + MOCK_METHOD2(OnJobDone, void(net::URLRequestJob* job,
|
| const URLRequestStatus& status));
|
| - MOCK_METHOD3(OnJobRedirect, void(URLRequestJob* job,
|
| + MOCK_METHOD3(OnJobRedirect, void(net::URLRequestJob* job,
|
| const GURL& location,
|
| int status_code));
|
| - MOCK_METHOD3(OnBytesRead, void(URLRequestJob* job,
|
| + MOCK_METHOD3(OnBytesRead, void(net::URLRequestJob* job,
|
| const char* buf,
|
| int byte_count));
|
| };
|
|
|
| -// A URLRequestJob that returns static content for given URLs. We do
|
| +// A net::URLRequestJob that returns static content for given URLs. We do
|
| // not use URLRequestTestJob here because URLRequestTestJob fakes
|
| // async operations by calling ReadRawData synchronously in an async
|
| -// callback. This test requires a URLRequestJob that returns false for
|
| +// callback. This test requires a net::URLRequestJob that returns false for
|
| // async reads, in order to exercise the real async read codepath.
|
| -class URLRequestJobTrackerTestJob : public URLRequestJob {
|
| +class URLRequestJobTrackerTestJob : public net::URLRequestJob {
|
| public:
|
| URLRequestJobTrackerTestJob(net::URLRequest* request, bool async_reads)
|
| - : URLRequestJob(request), async_reads_(async_reads) {}
|
| + : net::URLRequestJob(request), async_reads_(async_reads) {}
|
|
|
| void Start() {
|
| ASSERT_TRUE(GetResponseBody(request_->url(), &response_data_));
|
| @@ -125,7 +125,7 @@ class URLRequestJobTrackerTestJob : public URLRequestJob {
|
| encoding_types->push_back(Filter::FILTER_TYPE_GZIP);
|
| return true;
|
| } else {
|
| - return URLRequestJob::GetContentEncodings(encoding_types);
|
| + return net::URLRequestJob::GetContentEncodings(encoding_types);
|
| }
|
| }
|
|
|
| @@ -201,8 +201,9 @@ class URLRequestJobTrackerTest : public PlatformTest {
|
| };
|
|
|
| // static
|
| -URLRequestJob* URLRequestJobTrackerTest::Factory(net::URLRequest* request,
|
| - const std::string& scheme) {
|
| +net::URLRequestJob* URLRequestJobTrackerTest::Factory(
|
| + net::URLRequest* request,
|
| + const std::string& scheme) {
|
| return new URLRequestJobTrackerTestJob(request, g_async_reads);
|
| }
|
|
|
|
|