Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Unified Diff: net/url_request/url_request_job_tracker_unittest.cc

Issue 6166010: net: Remove typedef net::URLRequestStatus URLRequestStatus; (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | net/url_request/url_request_status.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 31818ac1f2338cdb4ceff1ee01ce8f600df00181..11a5e3b6c942ee1d592db65f66e3b3bf49fa05b6 100644
--- a/net/url_request/url_request_job_tracker_unittest.cc
+++ b/net/url_request/url_request_job_tracker_unittest.cc
@@ -54,7 +54,7 @@ class MockJobObserver : public net::URLRequestJobTracker::JobObserver {
MOCK_METHOD1(OnJobAdded, void(net::URLRequestJob* job));
MOCK_METHOD1(OnJobRemoved, void(net::URLRequestJob* job));
MOCK_METHOD2(OnJobDone, void(net::URLRequestJob* job,
- const URLRequestStatus& status));
+ const net::URLRequestStatus& status));
MOCK_METHOD3(OnJobRedirect, void(net::URLRequestJob* job,
const GURL& location,
int status_code));
@@ -94,12 +94,12 @@ class URLRequestJobTrackerTestJob : public net::URLRequestJob {
response_data_.erase(0, bytes_to_read);
if (async_reads_) {
- SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
+ SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING, 0));
MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(
this, &URLRequestJobTrackerTestJob::OnReadCompleted,
bytes_to_read));
} else {
- SetStatus(URLRequestStatus());
+ SetStatus(net::URLRequestStatus());
*bytes_read = bytes_to_read;
}
return !async_reads_;
@@ -107,9 +107,9 @@ class URLRequestJobTrackerTestJob : public net::URLRequestJob {
void OnReadCompleted(int status) {
if (status == 0) {
- NotifyDone(URLRequestStatus());
+ NotifyDone(net::URLRequestStatus());
} else if (status > 0) {
- SetStatus(URLRequestStatus());
+ SetStatus(net::URLRequestStatus());
} else {
ASSERT_FALSE(true) << "Unexpected OnReadCompleted callback.";
}
@@ -136,7 +136,7 @@ class URLRequestJobTrackerTestJob : public net::URLRequestJob {
const bool async_reads_;
};
-// Google Mock Matcher to check two URLRequestStatus instances for
+// Google Mock Matcher to check two net::URLRequestStatus instances for
// equality.
MATCHER_P(StatusEq, other, "") {
return (arg.status() == other.status() &&
@@ -172,7 +172,8 @@ class URLRequestJobTrackerTest : public PlatformTest {
EXPECT_CALL(observer, OnBytesRead(NotNull(),
MemEq(body.data(), body.size()),
Eq(static_cast<int>(body.size()))));
- EXPECT_CALL(observer, OnJobDone(NotNull(), StatusEq(URLRequestStatus())));
+ EXPECT_CALL(observer, OnJobDone(NotNull(),
+ StatusEq(net::URLRequestStatus())));
EXPECT_CALL(observer, OnJobRemoved(NotNull()));
// Attach our observer and perform the resource fetch.
« no previous file with comments | « net/spdy/spdy_network_transaction_unittest.cc ('k') | net/url_request/url_request_status.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698