summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher.cc2
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher.h2
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc4
-rw-r--r--chrome/common/net/gaia/gaia_oauth_client.cc4
-rw-r--r--chrome/common/net/gaia/gaia_oauth_client_unittest.cc2
-rw-r--r--chrome/common/net/test_url_fetcher_factory.cc2
-rw-r--r--chrome/common/net/url_fetcher.cc2
-rw-r--r--chrome/common/net/url_fetcher.h4
-rw-r--r--chrome/common/net/url_fetcher_unittest.cc36
9 files changed, 29 insertions, 29 deletions
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.cc b/chrome/common/net/gaia/gaia_auth_fetcher.cc
index 5f3d4d0..664c73d 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.cc
@@ -421,7 +421,7 @@ void GaiaAuthFetcher::OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
fetch_pending_ = false;
if (url == client_login_gurl_) {
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.h b/chrome/common/net/gaia/gaia_auth_fetcher.h
index f6f092b..5c33cd8 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.h
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.h
@@ -78,7 +78,7 @@ class GaiaAuthFetcher : public URLFetcher::Delegate {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
// StartClientLogin been called && results not back yet?
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
index 5815a3f..2e4e28b 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
@@ -53,7 +53,7 @@ void MockFetcher::Start() {
url_,
status,
http_code,
- ResponseCookies(),
+ net::ResponseCookies(),
results_);
}
@@ -102,7 +102,7 @@ class GaiaAuthFetcherTest : public testing::Test {
EXPECT_EQ(captcha_token, out_captcha_token);
}
- ResponseCookies cookies_;
+ net::ResponseCookies cookies_;
GURL client_login_source_;
GURL issue_auth_token_source_;
TestingProfile profile_;
diff --git a/chrome/common/net/gaia/gaia_oauth_client.cc b/chrome/common/net/gaia/gaia_oauth_client.cc
index ccda6a73..002821d 100644
--- a/chrome/common/net/gaia/gaia_oauth_client.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client.cc
@@ -49,7 +49,7 @@ class GaiaOAuthClient::Core
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
private:
@@ -118,7 +118,7 @@ void GaiaOAuthClient::Core::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
bool should_retry = false;
HandleResponse(source, url, status, response_code, data, &should_retry);
diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
index 0458a63..6282917e 100644
--- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
@@ -56,7 +56,7 @@ class MockOAuthFetcher : public URLFetcher {
url_,
status,
response_code_,
- ResponseCookies(),
+ net::ResponseCookies(),
results_);
}
diff --git a/chrome/common/net/test_url_fetcher_factory.cc b/chrome/common/net/test_url_fetcher_factory.cc
index 0ac8429..04fea1b 100644
--- a/chrome/common/net/test_url_fetcher_factory.cc
+++ b/chrome/common/net/test_url_fetcher_factory.cc
@@ -87,7 +87,7 @@ class FakeURLFetcher : public URLFetcher {
status.set_status(success_ ? net::URLRequestStatus::SUCCESS :
net::URLRequestStatus::FAILED);
delegate()->OnURLFetchComplete(this, url_, status, success_ ? 200 : 500,
- ResponseCookies(), response_data_);
+ net::ResponseCookies(), response_data_);
}
// Pre-baked response data and flag which indicates whether the request should
diff --git a/chrome/common/net/url_fetcher.cc b/chrome/common/net/url_fetcher.cc
index b92a66a..2276e32 100644
--- a/chrome/common/net/url_fetcher.cc
+++ b/chrome/common/net/url_fetcher.cc
@@ -130,7 +130,7 @@ class URLFetcher::Core
// Read buffer
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
// Cookie/cache info for the request
- ResponseCookies cookies_; // Response cookies
+ net::ResponseCookies cookies_; // Response cookies
net::HttpRequestHeaders extra_request_headers_;
scoped_refptr<net::HttpResponseHeaders> response_headers_;
bool was_fetched_via_proxy_;
diff --git a/chrome/common/net/url_fetcher.h b/chrome/common/net/url_fetcher.h
index 9c2e3a3..f4fcf77 100644
--- a/chrome/common/net/url_fetcher.h
+++ b/chrome/common/net/url_fetcher.h
@@ -23,13 +23,13 @@
#include "base/time.h"
class GURL;
-typedef std::vector<std::string> ResponseCookies;
namespace net {
class HostPortPair;
class HttpResponseHeaders;
class URLRequestContextGetter;
class URLRequestStatus;
+typedef std::vector<std::string> ResponseCookies;
} // namespace net
// To use this class, create an instance with the desired URL and a pointer to
@@ -78,7 +78,7 @@ class URLFetcher {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) = 0;
protected:
diff --git a/chrome/common/net/url_fetcher_unittest.cc b/chrome/common/net/url_fetcher_unittest.cc
index 9f84326..82171f9 100644
--- a/chrome/common/net/url_fetcher_unittest.cc
+++ b/chrome/common/net/url_fetcher_unittest.cc
@@ -82,7 +82,7 @@ class URLFetcherTest : public testing::Test, public URLFetcher::Delegate {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy() {
@@ -131,7 +131,7 @@ void URLFetcherTest::OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
EXPECT_TRUE(status.is_success());
EXPECT_EQ(200, response_code); // HTTP OK
@@ -158,7 +158,7 @@ class URLFetcherPostTest : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
};
@@ -170,7 +170,7 @@ class URLFetcherHeadersTest : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
};
@@ -182,7 +182,7 @@ class URLFetcherSocketAddressTest : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
protected:
std::string expected_host_;
@@ -198,7 +198,7 @@ class URLFetcherProtectTest : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
private:
Time start_time_;
@@ -214,7 +214,7 @@ class URLFetcherProtectTestPassedThrough : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
private:
Time start_time_;
@@ -230,7 +230,7 @@ class URLFetcherBadHTTPSTest : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
private:
@@ -246,7 +246,7 @@ class URLFetcherCancelTest : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
void CancelRequest();
@@ -299,7 +299,7 @@ class URLFetcherMultipleAttemptTest : public URLFetcherTest {
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data);
private:
std::string data_;
@@ -336,7 +336,7 @@ void URLFetcherPostTest::OnURLFetchComplete(const URLFetcher* source,
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
EXPECT_EQ(std::string("bobsyeruncle"), data);
URLFetcherTest::OnURLFetchComplete(source, url, status, response_code,
@@ -348,7 +348,7 @@ void URLFetcherHeadersTest::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
std::string header;
EXPECT_TRUE(source->response_headers()->GetNormalizedHeader("cache-control",
@@ -363,7 +363,7 @@ void URLFetcherSocketAddressTest::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
EXPECT_EQ("127.0.0.1", source->socket_address().host());
EXPECT_EQ(expected_port_, source->socket_address().port());
@@ -385,7 +385,7 @@ void URLFetcherProtectTest::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
const TimeDelta one_second = TimeDelta::FromMilliseconds(1000);
if (response_code >= 500) {
@@ -427,7 +427,7 @@ void URLFetcherProtectTestPassedThrough::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
const TimeDelta one_minute = TimeDelta::FromMilliseconds(60000);
if (response_code >= 500) {
@@ -466,7 +466,7 @@ void URLFetcherBadHTTPSTest::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
// This part is different from URLFetcherTest::OnURLFetchComplete
// because this test expects the request to be cancelled.
@@ -499,7 +499,7 @@ void URLFetcherCancelTest::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
// We should have cancelled the request before completion.
ADD_FAILURE();
@@ -519,7 +519,7 @@ void URLFetcherMultipleAttemptTest::OnURLFetchComplete(
const GURL& url,
const net::URLRequestStatus& status,
int response_code,
- const ResponseCookies& cookies,
+ const net::ResponseCookies& cookies,
const std::string& data) {
EXPECT_TRUE(status.is_success());
EXPECT_EQ(200, response_code); // HTTP OK
generated by cgit v1.1 at 2025-11-30 23:11:39 +0000