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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/common/net/url_fetcher_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 | « chrome/common/net/url_fetcher.cc ('k') | chrome/common/net/url_request_intercept_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/net/url_fetcher_unittest.cc
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc
index 16188920cd77f6b0ad40bb873fe56ad2eafc8eeb..44277e951f547e4bba0e821649d8c7aa08e48ef5 100644
--- a/chrome/common/net/url_fetcher_unittest.cc
+++ b/chrome/common/net/url_fetcher_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -62,7 +62,7 @@ class URLFetcherTest : public testing::Test, public URLFetcher::Delegate {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -108,7 +108,7 @@ class URLFetcherPostTest : public URLFetcherTest {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -120,7 +120,7 @@ class URLFetcherHeadersTest : public URLFetcherTest {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -133,7 +133,7 @@ class URLFetcherProtectTest : public URLFetcherTest {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -149,7 +149,7 @@ class URLFetcherProtectTestPassedThrough : public URLFetcherTest {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -165,7 +165,7 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -181,7 +181,7 @@ class URLFetcherCancelTest : public URLFetcherTest {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -234,7 +234,7 @@ class URLFetcherMultipleAttemptTest : public URLFetcherTest {
// URLFetcher::Delegate
virtual void OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data);
@@ -269,7 +269,7 @@ void URLFetcherTest::CreateFetcher(const GURL& url) {
void URLFetcherTest::OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
@@ -297,7 +297,7 @@ void URLFetcherPostTest::CreateFetcher(const GURL& url) {
void URLFetcherPostTest::OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
@@ -309,7 +309,7 @@ void URLFetcherPostTest::OnURLFetchComplete(const URLFetcher* source,
void URLFetcherHeadersTest::OnURLFetchComplete(
const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
@@ -330,12 +330,13 @@ void URLFetcherProtectTest::CreateFetcher(const GURL& url) {
fetcher_->Start();
}
-void URLFetcherProtectTest::OnURLFetchComplete(const URLFetcher* source,
- const GURL& url,
- const URLRequestStatus& status,
- int response_code,
- const ResponseCookies& cookies,
- const std::string& data) {
+void URLFetcherProtectTest::OnURLFetchComplete(
+ const URLFetcher* source,
+ const GURL& url,
+ const net::URLRequestStatus& status,
+ int response_code,
+ const ResponseCookies& cookies,
+ const std::string& data) {
const TimeDelta one_second = TimeDelta::FromMilliseconds(1000);
if (response_code >= 500) {
// Now running ServerUnavailable test.
@@ -374,7 +375,7 @@ void URLFetcherProtectTestPassedThrough::CreateFetcher(const GURL& url) {
void URLFetcherProtectTestPassedThrough::OnURLFetchComplete(
const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
@@ -413,13 +414,13 @@ URLFetcherBadHTTPSTest::URLFetcherBadHTTPSTest() {
void URLFetcherBadHTTPSTest::OnURLFetchComplete(
const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
// This part is different from URLFetcherTest::OnURLFetchComplete
// because this test expects the request to be cancelled.
- EXPECT_EQ(URLRequestStatus::CANCELED, status.status());
+ EXPECT_EQ(net::URLRequestStatus::CANCELED, status.status());
EXPECT_EQ(net::ERR_ABORTED, status.os_error());
EXPECT_EQ(-1, response_code);
EXPECT_TRUE(cookies.empty());
@@ -443,12 +444,13 @@ void URLFetcherCancelTest::CreateFetcher(const GURL& url) {
CancelRequest();
}
-void URLFetcherCancelTest::OnURLFetchComplete(const URLFetcher* source,
- const GURL& url,
- const URLRequestStatus& status,
- int response_code,
- const ResponseCookies& cookies,
- const std::string& data) {
+void URLFetcherCancelTest::OnURLFetchComplete(
+ const URLFetcher* source,
+ const GURL& url,
+ const net::URLRequestStatus& status,
+ int response_code,
+ const ResponseCookies& cookies,
+ const std::string& data) {
// We should have cancelled the request before completion.
ADD_FAILURE();
delete fetcher_;
@@ -465,7 +467,7 @@ void URLFetcherCancelTest::CancelRequest() {
void URLFetcherMultipleAttemptTest::OnURLFetchComplete(
const URLFetcher* source,
const GURL& url,
- const URLRequestStatus& status,
+ const net::URLRequestStatus& status,
int response_code,
const ResponseCookies& cookies,
const std::string& data) {
« no previous file with comments | « chrome/common/net/url_fetcher.cc ('k') | chrome/common/net/url_request_intercept_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698