diff options
86 files changed, 186 insertions, 185 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 6eb4ca6..5c2aaef 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -91,7 +91,7 @@ void AlternateNavURLFetcher::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK_EQ(fetcher_.get(), source); SetStatusFromURLFetch(url, status, response_code); diff --git a/chrome/browser/alternate_nav_url_fetcher.h b/chrome/browser/alternate_nav_url_fetcher.h index c004826..2531733 100644 --- a/chrome/browser/alternate_nav_url_fetcher.h +++ b/chrome/browser/alternate_nav_url_fetcher.h @@ -54,7 +54,7 @@ class AlternateNavURLFetcher : public NotificationObserver, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) OVERRIDE; // LinkInfoBarDelegate diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index 589b31a..fd40f47 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -234,7 +234,7 @@ void SearchProvider::OnURLFetchComplete(const URLFetcher* source, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookie, + const net::ResponseCookies& cookie, const std::string& data) { DCHECK(!done_); suggest_results_pending_--; diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h index 982cf75..e627cb4 100644 --- a/chrome/browser/autocomplete/search_provider.h +++ b/chrome/browser/autocomplete/search_provider.h @@ -72,7 +72,7 @@ class SearchProvider : public AutocompleteProvider, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // ID used in creating URLFetcher for default provider's suggest results. diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 4f9b104..8156b63 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_unittest.cc @@ -212,8 +212,8 @@ void SearchProviderTest::FinishDefaultSuggestQuery() { // Tell the SearchProvider the default suggest query is done. default_fetcher->delegate()->OnURLFetchComplete( - default_fetcher, GURL(), net::URLRequestStatus(), 200, ResponseCookies(), - std::string()); + default_fetcher, GURL(), net::URLRequestStatus(), 200, + net::ResponseCookies(), std::string()); } // Tests ----------------------------------------------------------------------- @@ -236,7 +236,7 @@ TEST_F(SearchProviderTest, QueryDefaultProvider) { // Tell the SearchProvider the suggest query is done. fetcher->delegate()->OnURLFetchComplete( - fetcher, GURL(), net::URLRequestStatus(), 200, ResponseCookies(), + fetcher, GURL(), net::URLRequestStatus(), 200, net::ResponseCookies(), std::string()); fetcher = NULL; @@ -284,8 +284,8 @@ TEST_F(SearchProviderTest, QueryKeywordProvider) { // Tell the SearchProvider the default suggest query is done. default_fetcher->delegate()->OnURLFetchComplete( - default_fetcher, GURL(), net::URLRequestStatus(), 200, ResponseCookies(), - std::string()); + default_fetcher, GURL(), net::URLRequestStatus(), 200, + net::ResponseCookies(), std::string()); default_fetcher = NULL; // Make sure the keyword providers suggest service was queried. @@ -300,8 +300,8 @@ TEST_F(SearchProviderTest, QueryKeywordProvider) { // Tell the SearchProvider the keyword suggest query is done. keyword_fetcher->delegate()->OnURLFetchComplete( - keyword_fetcher, GURL(), net::URLRequestStatus(), 200, ResponseCookies(), - std::string()); + keyword_fetcher, GURL(), net::URLRequestStatus(), 200, + net::ResponseCookies(), std::string()); keyword_fetcher = NULL; // Run till the history results complete. diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 9337f39..1414898 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -138,10 +138,11 @@ class AutofillTest : public InProcessBrowserTest { " };" "})();"; - fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(), - status, success ? 200 : 500, - ResponseCookies(), - script); + fetcher->delegate()->OnURLFetchComplete(fetcher, + fetcher->original_url(), + status, success ? 200 : 500, + net::ResponseCookies(), + script); } void FocusFirstNameField() { diff --git a/chrome/browser/autofill/autofill_download.cc b/chrome/browser/autofill/autofill_download.cc index a8ce10e..28ff45ed 100644 --- a/chrome/browser/autofill/autofill_download.cc +++ b/chrome/browser/autofill/autofill_download.cc @@ -266,7 +266,7 @@ void AutofillDownloadManager::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { std::map<URLFetcher *, FormRequestData>::iterator it = url_fetchers_.find(const_cast<URLFetcher*>(source)); diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h index b019495..8607474 100644 --- a/chrome/browser/autofill/autofill_download.h +++ b/chrome/browser/autofill/autofill_download.h @@ -138,7 +138,7 @@ class AutofillDownloadManager : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Profile for preference storage. diff --git a/chrome/browser/autofill/autofill_download_unittest.cc b/chrome/browser/autofill/autofill_download_unittest.cc index 1261568..9591731 100644 --- a/chrome/browser/autofill/autofill_download_unittest.cc +++ b/chrome/browser/autofill/autofill_download_unittest.cc @@ -241,7 +241,7 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) { ASSERT_TRUE(fetcher); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 200, ResponseCookies(), + 200, net::ResponseCookies(), std::string(responses[1])); // After that upload rates would be adjusted to 0.5/0.3 EXPECT_DOUBLE_EQ(0.5, helper.download_manager.GetPositiveUploadRate()); @@ -251,13 +251,13 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) { ASSERT_TRUE(fetcher); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 404, ResponseCookies(), + 404, net::ResponseCookies(), std::string(responses[2])); fetcher = factory.GetFetcherByID(0); ASSERT_TRUE(fetcher); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 200, ResponseCookies(), + 200, net::ResponseCookies(), std::string(responses[0])); EXPECT_EQ(static_cast<size_t>(3), helper.responses_.size()); @@ -317,7 +317,7 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) { base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms())); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 500, ResponseCookies(), + 500, net::ResponseCookies(), std::string(responses[0])); EXPECT_EQ(AutofillDownloadTestHelper::REQUEST_QUERY_FAILED, helper.responses_.front().type_of_response); @@ -345,7 +345,7 @@ TEST_F(AutofillDownloadTest, QueryAndUploadTest) { base::TimeDelta::FromMilliseconds(TestTimeouts::action_max_timeout_ms())); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 503, ResponseCookies(), + 503, net::ResponseCookies(), std::string(responses[2])); EXPECT_EQ(AutofillDownloadTestHelper::REQUEST_UPLOAD_FAILED, helper.responses_.front().type_of_response); @@ -453,7 +453,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) { ASSERT_TRUE(fetcher); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 200, ResponseCookies(), + 200, net::ResponseCookies(), std::string(responses[0])); ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size()); EXPECT_EQ(responses[0], helper.responses_.front().response); @@ -482,7 +482,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) { ASSERT_TRUE(fetcher); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 200, ResponseCookies(), + 200, net::ResponseCookies(), std::string(responses[1])); ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size()); EXPECT_EQ(responses[1], helper.responses_.front().response); @@ -499,7 +499,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) { ASSERT_TRUE(fetcher); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 200, ResponseCookies(), + 200, net::ResponseCookies(), std::string(responses[2])); ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size()); EXPECT_EQ(responses[2], helper.responses_.front().response); @@ -535,7 +535,7 @@ TEST_F(AutofillDownloadTest, CacheQueryTest) { ASSERT_TRUE(fetcher); fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(), net::URLRequestStatus(), - 200, ResponseCookies(), + 200, net::ResponseCookies(), std::string(responses[0])); ASSERT_EQ(static_cast<size_t>(1), helper.responses_.size()); EXPECT_EQ(responses[0], helper.responses_.front().response); diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc index ebb8e24..ba60553 100644 --- a/chrome/browser/bug_report_util.cc +++ b/chrome/browser/bug_report_util.cc @@ -93,7 +93,7 @@ class BugReportUtil::PostCleanup : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); protected: @@ -115,7 +115,7 @@ void BugReportUtil::PostCleanup::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { std::stringstream error_stream; diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc index 33e40d2..37323cf 100644 --- a/chrome/browser/chromeos/customization_document.cc +++ b/chrome/browser/chromeos/customization_document.cc @@ -319,7 +319,7 @@ void ServicesCustomizationDocument::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { if (response_code == 200) { LoadManifestFromString(data); diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h index f673266..f194554 100644 --- a/chrome/browser/chromeos/customization_document.h +++ b/chrome/browser/chromeos/customization_document.h @@ -175,7 +175,7 @@ class ServicesCustomizationDocument : public CustomizationDocument, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Initiate file fetching. diff --git a/chrome/browser/chromeos/login/cookie_fetcher.cc b/chrome/browser/chromeos/login/cookie_fetcher.cc index 22fb2da..25e5e79 100644 --- a/chrome/browser/chromeos/login/cookie_fetcher.cc +++ b/chrome/browser/chromeos/login/cookie_fetcher.cc @@ -36,7 +36,7 @@ void CookieFetcher::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) { if (status.is_success() && response_code == kHttpSuccess) { if (issue_handler_->CanHandle(url)) { diff --git a/chrome/browser/chromeos/login/cookie_fetcher.h b/chrome/browser/chromeos/login/cookie_fetcher.h index 0cae04d..2540479 100644 --- a/chrome/browser/chromeos/login/cookie_fetcher.h +++ b/chrome/browser/chromeos/login/cookie_fetcher.h @@ -7,6 +7,7 @@ #pragma once #include <string> + #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/login/auth_response_handler.h" #include "chrome/browser/chromeos/login/client_login_response_handler.h" @@ -49,7 +50,7 @@ class CookieFetcher : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); private: diff --git a/chrome/browser/chromeos/login/image_downloader.cc b/chrome/browser/chromeos/login/image_downloader.cc index b36a44e..73f88ad 100644 --- a/chrome/browser/chromeos/login/image_downloader.cc +++ b/chrome/browser/chromeos/login/image_downloader.cc @@ -10,9 +10,9 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "content/browser/browser_thread.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/net/url_fetcher.h" +#include "content/browser/browser_thread.h" namespace chromeos { @@ -42,7 +42,7 @@ void ImageDownloader::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) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (response_code != 200) { diff --git a/chrome/browser/chromeos/login/image_downloader.h b/chrome/browser/chromeos/login/image_downloader.h index c18170c..a3683be 100644 --- a/chrome/browser/chromeos/login/image_downloader.h +++ b/chrome/browser/chromeos/login/image_downloader.h @@ -33,7 +33,7 @@ class ImageDownloader : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); ImageDecoder::Delegate* delegate_; diff --git a/chrome/browser/chromeos/login/mock_auth_response_handler.cc b/chrome/browser/chromeos/login/mock_auth_response_handler.cc index be82e83..419b107 100644 --- a/chrome/browser/chromeos/login/mock_auth_response_handler.cc +++ b/chrome/browser/chromeos/login/mock_auth_response_handler.cc @@ -42,7 +42,7 @@ void MockAuthResponseHandler::CompleteFetch(URLFetcher::Delegate* delegate, remote, status, http_response_code, - ResponseCookies(), + net::ResponseCookies(), data); } diff --git a/chrome/browser/chromeos/login/mock_url_fetchers.cc b/chrome/browser/chromeos/login/mock_url_fetchers.cc index de666e9..2a855c2 100644 --- a/chrome/browser/chromeos/login/mock_url_fetchers.cc +++ b/chrome/browser/chromeos/login/mock_url_fetchers.cc @@ -62,7 +62,7 @@ void GotCanceledFetcher::Start() { url_, status, RC_FORBIDDEN, - ResponseCookies(), + net::ResponseCookies(), std::string()); } @@ -83,7 +83,7 @@ void SuccessFetcher::Start() { url_, success, RC_REQUEST_OK, - ResponseCookies(), + net::ResponseCookies(), std::string()); } @@ -104,7 +104,7 @@ void FailFetcher::Start() { url_, failed, RC_REQUEST_OK, - ResponseCookies(), + net::ResponseCookies(), std::string()); } @@ -158,7 +158,7 @@ void CaptchaFetcher::Start() { url_, success, RC_FORBIDDEN, - ResponseCookies(), + net::ResponseCookies(), body); } @@ -187,7 +187,7 @@ void HostedFetcher::Start() { url_, success, response_code, - ResponseCookies(), + net::ResponseCookies(), data); } diff --git a/chrome/browser/chromeos/login/user_image_downloader.cc b/chrome/browser/chromeos/login/user_image_downloader.cc index 2da9305..c6d9c29 100644 --- a/chrome/browser/chromeos/login/user_image_downloader.cc +++ b/chrome/browser/chromeos/login/user_image_downloader.cc @@ -62,7 +62,7 @@ void UserImageDownloader::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); if (response_code != 200) { diff --git a/chrome/browser/chromeos/login/user_image_downloader.h b/chrome/browser/chromeos/login/user_image_downloader.h index c6c776bf..655f8e6 100644 --- a/chrome/browser/chromeos/login/user_image_downloader.h +++ b/chrome/browser/chromeos/login/user_image_downloader.h @@ -39,7 +39,7 @@ class UserImageDownloader : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Overriden from ImageDecoder::Delegate: diff --git a/chrome/browser/extensions/extension_updater.cc b/chrome/browser/extensions/extension_updater.cc index ff17eff..57adabd 100644 --- a/chrome/browser/extensions/extension_updater.cc +++ b/chrome/browser/extensions/extension_updater.cc @@ -594,7 +594,7 @@ void ExtensionUpdater::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { // Stop() destroys all our URLFetchers, which means we shouldn't be // called after Stop() is called. diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h index 3baaf2e..2cc7367 100644 --- a/chrome/browser/extensions/extension_updater.h +++ b/chrome/browser/extensions/extension_updater.h @@ -240,7 +240,7 @@ class ExtensionUpdater : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // These do the actual work when a URL fetch completes. diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index 6cfc5ec..899798ed 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -15,22 +15,22 @@ #include "base/threading/thread.h" #include "base/version.h" #include "chrome/browser/extensions/extension_error_reporter.h" -#include "chrome/browser/extensions/extension_updater.h" #include "chrome/browser/extensions/extension_sync_data.h" +#include "chrome/browser/extensions/extension_updater.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/pref_names.h" #include "chrome/common/net/test_url_fetcher_factory.h" +#include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" +#include "libxml/globals.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" #include "testing/gtest/include/gtest/gtest.h" -#include "libxml/globals.h" using base::Time; using base::TimeDelta; @@ -578,7 +578,7 @@ class ExtensionUpdaterTest : public testing::Test { EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL); EXPECT_TRUE(fetcher->load_flags() == expected_load_flags); fetcher->delegate()->OnURLFetchComplete( - fetcher, url1, net::URLRequestStatus(), 200, ResponseCookies(), + fetcher, url1, net::URLRequestStatus(), 200, net::ResponseCookies(), invalid_xml); // Now that the first request is complete, make sure the second one has @@ -596,7 +596,7 @@ class ExtensionUpdaterTest : public testing::Test { EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL); EXPECT_TRUE(fetcher->load_flags() == expected_load_flags); fetcher->delegate()->OnURLFetchComplete( - fetcher, url2, net::URLRequestStatus(), 200, ResponseCookies(), + fetcher, url2, net::URLRequestStatus(), 200, net::ResponseCookies(), kValidXml); // This should run the manifest parsing, then we want to make sure that our @@ -658,7 +658,7 @@ class ExtensionUpdaterTest : public testing::Test { EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL); EXPECT_TRUE(fetcher->load_flags() == expected_load_flags); fetcher->delegate()->OnURLFetchComplete( - fetcher, test_url, net::URLRequestStatus(), 200, ResponseCookies(), + fetcher, test_url, net::URLRequestStatus(), 200, net::ResponseCookies(), extension_data); file_thread.Stop(); @@ -714,7 +714,7 @@ class ExtensionUpdaterTest : public testing::Test { EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL); EXPECT_TRUE(fetcher->load_flags() == expected_load_flags); fetcher->delegate()->OnURLFetchComplete( - fetcher, test_url, net::URLRequestStatus(), 200, ResponseCookies(), + fetcher, test_url, net::URLRequestStatus(), 200, net::ResponseCookies(), extension_data); message_loop.RunAllPending(); @@ -766,7 +766,7 @@ class ExtensionUpdaterTest : public testing::Test { EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL); EXPECT_TRUE(fetcher->load_flags() == expected_load_flags); fetcher->delegate()->OnURLFetchComplete( - fetcher, url1, net::URLRequestStatus(), 200, ResponseCookies(), + fetcher, url1, net::URLRequestStatus(), 200, net::ResponseCookies(), extension_data1); message_loop.RunAllPending(); @@ -785,7 +785,7 @@ class ExtensionUpdaterTest : public testing::Test { EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL); EXPECT_TRUE(fetcher->load_flags() == expected_load_flags); fetcher->delegate()->OnURLFetchComplete( - fetcher, url2, net::URLRequestStatus(), 200, ResponseCookies(), + fetcher, url2, net::URLRequestStatus(), 200, net::ResponseCookies(), extension_data2); message_loop.RunAllPending(); EXPECT_EQ(id2, service.extension_id()); @@ -869,7 +869,7 @@ class ExtensionUpdaterTest : public testing::Test { fetched_urls.push_back(fetcher->original_url()); fetcher->delegate()->OnURLFetchComplete( fetcher, fetched_urls[0], net::URLRequestStatus(), 500, - ResponseCookies(), ""); + net::ResponseCookies(), ""); fetcher = factory.GetFetcherByID(ExtensionUpdater::kManifestFetcherId); fetched_urls.push_back(fetcher->original_url()); diff --git a/chrome/browser/google/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc index 66567bb..a851f9e 100644 --- a/chrome/browser/google/google_url_tracker.cc +++ b/chrome/browser/google/google_url_tracker.cc @@ -202,7 +202,7 @@ void GoogleURLTracker::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) { // Delete the fetcher on this function's exit. scoped_ptr<URLFetcher> clean_up_fetcher(fetcher_.release()); diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h index 6de5002..559cdca 100644 --- a/chrome/browser/google/google_url_tracker.h +++ b/chrome/browser/google/google_url_tracker.h @@ -110,7 +110,7 @@ class GoogleURLTracker : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // NotificationObserver diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc index ede4e4b..04673fe 100644 --- a/chrome/browser/google/google_url_tracker_unittest.cc +++ b/chrome/browser/google/google_url_tracker_unittest.cc @@ -179,7 +179,7 @@ void GoogleURLTrackerTest::MockSearchDomainCheckResponse( return; fetcher->delegate()->OnURLFetchComplete(fetcher, GURL(GoogleURLTracker::kSearchDomainCheckURL), net::URLRequestStatus(), - 200, ResponseCookies(), domain); + 200, net::ResponseCookies(), domain); // At this point, |fetcher| is deleted. MessageLoop::current()->RunAllPending(); } diff --git a/chrome/browser/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 3ccc9c9..66676233 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -100,7 +100,7 @@ void Toolbar5Importer::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { if (cancelled()) { EndImport(); diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h index a6865f7..622c2c7 100644 --- a/chrome/browser/importer/toolbar_importer.h +++ b/chrome/browser/importer/toolbar_importer.h @@ -51,7 +51,7 @@ class Toolbar5Importer : public URLFetcher::Delegate, public Importer { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); private: diff --git a/chrome/browser/intranet_redirect_detector.cc b/chrome/browser/intranet_redirect_detector.cc index 67e14fe..36d35c1 100644 --- a/chrome/browser/intranet_redirect_detector.cc +++ b/chrome/browser/intranet_redirect_detector.cc @@ -95,7 +95,7 @@ void IntranetRedirectDetector::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { // Delete the fetcher on this function's exit. Fetchers::iterator fetcher = fetchers_.find(const_cast<URLFetcher*>(source)); diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h index 3dfcb9c..49dc197 100644 --- a/chrome/browser/intranet_redirect_detector.h +++ b/chrome/browser/intranet_redirect_detector.h @@ -70,7 +70,7 @@ class IntranetRedirectDetector const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // NetworkChangeNotifier::IPAddressObserver diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc index 11f61bc..bc4e094 100644 --- a/chrome/browser/metrics/metrics_service.cc +++ b/chrome/browser/metrics/metrics_service.cc @@ -1291,7 +1291,7 @@ void MetricsService::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) { DCHECK(waiting_for_asynchronus_reporting_step_); waiting_for_asynchronus_reporting_step_ = false; diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h index 6acb6a2..491a375 100644 --- a/chrome/browser/metrics/metrics_service.h +++ b/chrome/browser/metrics/metrics_service.h @@ -253,7 +253,7 @@ class MetricsService : public NotificationObserver, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Logs debugging details, for the case where the server returns a response diff --git a/chrome/browser/net/sdch_dictionary_fetcher.cc b/chrome/browser/net/sdch_dictionary_fetcher.cc index 4cd8211..4707c95 100644 --- a/chrome/browser/net/sdch_dictionary_fetcher.cc +++ b/chrome/browser/net/sdch_dictionary_fetcher.cc @@ -74,7 +74,7 @@ void SdchDictionaryFetcher::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { if ((200 == response_code) && (status.status() == net::URLRequestStatus::SUCCESS)) diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h index 9080aab..e89e192 100644 --- a/chrome/browser/net/sdch_dictionary_fetcher.h +++ b/chrome/browser/net/sdch_dictionary_fetcher.h @@ -54,7 +54,7 @@ class SdchDictionaryFetcher : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // A queue of URLs that are being used to download dictionaries. diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc index 6e59658..6740e53 100644 --- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc +++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.cc @@ -288,7 +288,7 @@ void WebSocketExperimentTask::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { result_.url_fetch = base::TimeTicks::Now() - url_fetch_start_time_; RevokeTimeoutTimer(); diff --git a/chrome/browser/net/websocket_experiment/websocket_experiment_task.h b/chrome/browser/net/websocket_experiment/websocket_experiment_task.h index 8996eeb..d3ff704 100644 --- a/chrome/browser/net/websocket_experiment/websocket_experiment_task.h +++ b/chrome/browser/net/websocket_experiment/websocket_experiment_task.h @@ -153,7 +153,7 @@ class WebSocketExperimentTask : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // net::WebSocketDelegate methods diff --git a/chrome/browser/policy/device_management_backend_impl.cc b/chrome/browser/policy/device_management_backend_impl.cc index 5bb4922..163ce3f 100644 --- a/chrome/browser/policy/device_management_backend_impl.cc +++ b/chrome/browser/policy/device_management_backend_impl.cc @@ -120,7 +120,7 @@ class DeviceManagementJobBase // DeviceManagementJob overrides: virtual void HandleResponse(const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); virtual GURL GetURL(const std::string& server_url); virtual void ConfigureRequest(URLFetcher* fetcher); @@ -189,7 +189,7 @@ class DeviceManagementJobBase void DeviceManagementJobBase::HandleResponse( const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { // Delete ourselves when this is done. scoped_ptr<DeviceManagementJob> scoped_killer(this); diff --git a/chrome/browser/policy/device_management_service.cc b/chrome/browser/policy/device_management_service.cc index be8c151..698e3a3 100644 --- a/chrome/browser/policy/device_management_service.cc +++ b/chrome/browser/policy/device_management_service.cc @@ -183,7 +183,7 @@ void DeviceManagementService::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { JobFetcherMap::iterator entry(pending_jobs_.find(source)); if (entry != pending_jobs_.end()) { diff --git a/chrome/browser/policy/device_management_service.h b/chrome/browser/policy/device_management_service.h index 7e23cc8..1b8f006 100644 --- a/chrome/browser/policy/device_management_service.h +++ b/chrome/browser/policy/device_management_service.h @@ -39,7 +39,7 @@ class DeviceManagementService : public URLFetcher::Delegate { // Handles the URL request response. virtual void HandleResponse(const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) = 0; // Gets the URL to contact. @@ -85,7 +85,7 @@ class DeviceManagementService : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Server at which to contact the service. diff --git a/chrome/browser/policy/device_management_service_unittest.cc b/chrome/browser/policy/device_management_service_unittest.cc index 51a3065..576900d 100644 --- a/chrome/browser/policy/device_management_service_unittest.cc +++ b/chrome/browser/policy/device_management_service_unittest.cc @@ -113,7 +113,7 @@ TEST_P(DeviceManagementServiceFailedRequestTest, RegisterRequest) { GURL(kServiceUrl), GetParam().request_status_, GetParam().http_status_, - ResponseCookies(), + net::ResponseCookies(), GetParam().response_); } @@ -129,7 +129,7 @@ TEST_P(DeviceManagementServiceFailedRequestTest, UnregisterRequest) { GURL(kServiceUrl), GetParam().request_status_, GetParam().http_status_, - ResponseCookies(), + net::ResponseCookies(), GetParam().response_); } @@ -149,7 +149,7 @@ TEST_P(DeviceManagementServiceFailedRequestTest, PolicyRequest) { GURL(kServiceUrl), GetParam().request_status_, GetParam().http_status_, - ResponseCookies(), + net::ResponseCookies(), GetParam().response_); } @@ -316,7 +316,7 @@ TEST_F(DeviceManagementServiceTest, RegisterRequest) { GURL(kServiceUrl), status, 200, - ResponseCookies(), + net::ResponseCookies(), response_data); } @@ -358,7 +358,7 @@ TEST_F(DeviceManagementServiceTest, UnregisterRequest) { GURL(kServiceUrl), status, 200, - ResponseCookies(), + net::ResponseCookies(), response_data); } @@ -433,7 +433,7 @@ TEST_F(DeviceManagementServiceTest, JobQueueing) { GURL(kServiceUrl), status, 200, - ResponseCookies(), + net::ResponseCookies(), response_data); } @@ -473,7 +473,7 @@ TEST_F(DeviceManagementServiceTest, CancelDuringCallback) { GURL(kServiceUrl), status, 500, - ResponseCookies(), + net::ResponseCookies(), ""); // Backend should have been reset. diff --git a/chrome/browser/remoting/directory_add_request.cc b/chrome/browser/remoting/directory_add_request.cc index 9c3d6c6..d6dae8e 100644 --- a/chrome/browser/remoting/directory_add_request.cc +++ b/chrome/browser/remoting/directory_add_request.cc @@ -63,7 +63,7 @@ void DirectoryAddRequest::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK_EQ(source, fetcher_.get()); diff --git a/chrome/browser/remoting/directory_add_request.h b/chrome/browser/remoting/directory_add_request.h index 8bcfaf4..5fbc20f 100644 --- a/chrome/browser/remoting/directory_add_request.h +++ b/chrome/browser/remoting/directory_add_request.h @@ -57,7 +57,7 @@ class DirectoryAddRequest : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); private: diff --git a/chrome/browser/remoting/directory_add_request_unittest.cc b/chrome/browser/remoting/directory_add_request_unittest.cc index 3c6d496..625262f 100644 --- a/chrome/browser/remoting/directory_add_request_unittest.cc +++ b/chrome/browser/remoting/directory_add_request_unittest.cc @@ -37,7 +37,7 @@ class DirectoryAddRequestTest : public testing::Test { GURL url; net::URLRequestStatus status_ok; - ResponseCookies cookies; + net::ResponseCookies cookies; target_->OnURLFetchComplete(NULL, url, status_ok, response_code, cookies, data); } diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc index 2521eb4..1d7b844 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service.cc @@ -137,7 +137,7 @@ void ClientSideDetectionService::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { if (source == model_fetcher_.get()) { HandleModelResponse(source, url, status, response_code, cookies, data); @@ -302,7 +302,7 @@ void ClientSideDetectionService::HandleModelResponse( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { if (status.is_success() && RC_REQUEST_OK == response_code) { // Copy the model because it has to be accessible after this function @@ -333,7 +333,7 @@ void ClientSideDetectionService::HandlePhishingVerdict( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { ClientPhishingResponse response; scoped_ptr<ClientReportInfo> info(client_phishing_reports_[source]); diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h index 29321e0..3ebafdc 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service.h +++ b/chrome/browser/safe_browsing/client_side_detection_service.h @@ -68,7 +68,7 @@ class ClientSideDetectionService : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // NotificationObserver overrides: @@ -189,7 +189,7 @@ class ClientSideDetectionService : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Called by OnURLFetchComplete to handle the server response from @@ -198,7 +198,7 @@ class ClientSideDetectionService : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Invalidate cache results which are no longer useful. diff --git a/chrome/browser/safe_browsing/malware_details_cache.cc b/chrome/browser/safe_browsing/malware_details_cache.cc index e41a792..51e363c 100644 --- a/chrome/browser/safe_browsing/malware_details_cache.cc +++ b/chrome/browser/safe_browsing/malware_details_cache.cc @@ -103,7 +103,7 @@ void MalwareDetailsCacheCollector::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DVLOG(1) << "OnUrlFetchComplete"; DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); diff --git a/chrome/browser/safe_browsing/malware_details_cache.h b/chrome/browser/safe_browsing/malware_details_cache.h index 3f002c7..334784b 100644 --- a/chrome/browser/safe_browsing/malware_details_cache.h +++ b/chrome/browser/safe_browsing/malware_details_cache.h @@ -60,7 +60,7 @@ class MalwareDetailsCacheCollector const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); private: diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc index 127bf5c..52a2927 100644 --- a/chrome/browser/safe_browsing/protocol_manager.cc +++ b/chrome/browser/safe_browsing/protocol_manager.cc @@ -209,7 +209,7 @@ void SafeBrowsingProtocolManager::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { scoped_ptr<const URLFetcher> fetcher; bool parsed_ok = true; diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h index 61f0713..11a264e0 100644 --- a/chrome/browser/safe_browsing/protocol_manager.h +++ b/chrome/browser/safe_browsing/protocol_manager.h @@ -107,7 +107,7 @@ class SafeBrowsingProtocolManager : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // API used by the SafeBrowsingService for issuing queries. When the results diff --git a/chrome/browser/safe_browsing/safe_browsing_test.cc b/chrome/browser/safe_browsing/safe_browsing_test.cc index 80ba01d..53c65fe 100644 --- a/chrome/browser/safe_browsing/safe_browsing_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_test.cc @@ -21,9 +21,10 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_number_conversions.h" -#include "base/string_util.h" #include "base/string_split.h" +#include "base/string_util.h" #include "base/synchronization/lock.h" +#include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -34,10 +35,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" +#include "chrome/test/ui_test_utils.h" #include "content/browser/browser_thread.h" #include "content/browser/renderer_host/resource_dispatcher_host.h" -#include "base/test/test_timeouts.h" -#include "chrome/test/ui_test_utils.h" #include "net/base/host_resolver.h" #include "net/base/load_flags.h" #include "net/base/net_log.h" @@ -497,7 +497,7 @@ class SafeBrowsingServiceTestHelper const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { response_data_ = data; response_status_ = status.status(); diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc index 4d07128..5ae8b8e 100644 --- a/chrome/browser/search_engines/template_url_fetcher.cc +++ b/chrome/browser/search_engines/template_url_fetcher.cc @@ -44,7 +44,7 @@ class TemplateURLFetcher::RequestDelegate : public URLFetcher::Delegate, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // URL of the OSDD. @@ -121,7 +121,7 @@ void TemplateURLFetcher::RequestDelegate::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { template_url_.reset(new TemplateURL()); diff --git a/chrome/browser/spellcheck_host_impl.cc b/chrome/browser/spellcheck_host_impl.cc index fb81413..c975740 100644 --- a/chrome/browser/spellcheck_host_impl.cc +++ b/chrome/browser/spellcheck_host_impl.cc @@ -298,7 +298,7 @@ void SpellCheckHostImpl::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) { DCHECK(source); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/chrome/browser/spellcheck_host_impl.h b/chrome/browser/spellcheck_host_impl.h index 5d001c5..b080505 100644 --- a/chrome/browser/spellcheck_host_impl.h +++ b/chrome/browser/spellcheck_host_impl.h @@ -93,7 +93,7 @@ class SpellCheckHostImpl : public SpellCheckHost, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // NotificationObserver implementation. diff --git a/chrome/browser/sync/glue/http_bridge.cc b/chrome/browser/sync/glue/http_bridge.cc index 70498f7..7f6ea88 100644 --- a/chrome/browser/sync/glue/http_bridge.cc +++ b/chrome/browser/sync/glue/http_bridge.cc @@ -269,7 +269,7 @@ void HttpBridge::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) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); base::AutoLock lock(fetch_state_lock_); diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h index 2ff3588..4c01392 100644 --- a/chrome/browser/sync/glue/http_bridge.h +++ b/chrome/browser/sync/glue/http_bridge.h @@ -121,7 +121,7 @@ class HttpBridge : public base::RefCountedThreadSafe<HttpBridge>, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); #if defined(UNIT_TEST) diff --git a/chrome/browser/sync/glue/http_bridge_unittest.cc b/chrome/browser/sync/glue/http_bridge_unittest.cc index 995c53b..f6be81f 100644 --- a/chrome/browser/sync/glue/http_bridge_unittest.cc +++ b/chrome/browser/sync/glue/http_bridge_unittest.cc @@ -8,8 +8,8 @@ #include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/test/test_url_request_context_getter.h" #include "content/browser/browser_thread.h" -#include "net/url_request/url_request_test_util.h" #include "net/test/test_server.h" +#include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" using browser_sync::HttpBridge; @@ -125,7 +125,7 @@ class ShuntedHttpBridge : public HttpBridge { void CallOnURLFetchComplete() { ASSERT_TRUE(MessageLoop::current() == test_->io_thread_loop()); // We return no cookies and a dummy content response. - ResponseCookies cookies; + net::ResponseCookies cookies; std::string response_content = "success!"; DummyURLFetcher fetcher; diff --git a/chrome/browser/sync/signin_manager_unittest.cc b/chrome/browser/sync/signin_manager_unittest.cc index 12c4204d..35d2070 100644 --- a/chrome/browser/sync/signin_manager_unittest.cc +++ b/chrome/browser/sync/signin_manager_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/net/test_url_fetcher_factory.h" -#include "chrome/test/testing_profile.h" #include "chrome/test/signaling_task.h" +#include "chrome/test/testing_profile.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_status.h" @@ -36,7 +36,7 @@ class SigninManagerTest : public TokenServiceTestHarness { DCHECK(fetcher->delegate()); fetcher->delegate()->OnURLFetchComplete( fetcher, GURL(GaiaAuthFetcher::kClientLoginUrl), - net::URLRequestStatus(), 200, ResponseCookies(), + net::URLRequestStatus(), 200, net::ResponseCookies(), "SID=sid\nLSID=lsid\nAuth=auth"); // Then simulate the correct GetUserInfo response for the canonical email. @@ -46,7 +46,7 @@ class SigninManagerTest : public TokenServiceTestHarness { DCHECK(fetcher->delegate()); fetcher->delegate()->OnURLFetchComplete( fetcher, GURL(GaiaAuthFetcher::kGetUserInfoUrl), - net::URLRequestStatus(), 200, ResponseCookies(), + net::URLRequestStatus(), 200, net::ResponseCookies(), "email=user@gmail.com"); } diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 3322ca02..98e7f20 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -295,7 +295,7 @@ void TranslateManager::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) { scoped_ptr<const URLFetcher> delete_ptr(source); DCHECK(translate_script_request_pending_); diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h index 18c0f6f..5690321 100644 --- a/chrome/browser/translate/translate_manager.h +++ b/chrome/browser/translate/translate_manager.h @@ -68,7 +68,7 @@ class TranslateManager : public NotificationObserver, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); // Used by unit-tests to override the default delay after which the translate diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index ff01361..a5103f3 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -7,16 +7,16 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_change_registrar.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/translate/translate_manager.h" #include "chrome/browser/translate/translate_prefs.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" +#include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" -#include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/testing_profile.h" #include "content/browser/browser_thread.h" @@ -32,8 +32,8 @@ #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" -#include "third_party/cld/languages/public/languages.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" +#include "third_party/cld/languages/public/languages.h" using testing::_; using testing::Pointee; @@ -183,7 +183,7 @@ class TranslateManagerTest : public TabContentsWrapperTestHarness, net::URLRequestStatus::FAILED); fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(), status, success ? 200 : 500, - ResponseCookies(), + net::ResponseCookies(), std::string()); } diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc index 1bd0393..83c4b40 100644 --- a/chrome/browser/web_resource/web_resource_service.cc +++ b/chrome/browser/web_resource/web_resource_service.cc @@ -82,7 +82,7 @@ class WebResourceService::WebResourceFetcher const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { // Delete the URLFetcher when this function exits. scoped_ptr<URLFetcher> clean_up_fetcher(url_fetcher_.release()); 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 diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.cc b/chrome/service/cloud_print/cloud_print_url_fetcher.cc index 56b67cc1..6fa7510 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher.cc @@ -47,7 +47,7 @@ void CloudPrintURLFetcher::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { VLOG(1) << "CP_PROXY: OnURLFetchComplete, url: " << url << ", response code: " << response_code; diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h index d952ec2..c56fd16 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher.h +++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h @@ -44,7 +44,7 @@ class CloudPrintURLFetcher const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { return CONTINUE_PROCESSING; } @@ -95,7 +95,7 @@ class CloudPrintURLFetcher virtual void 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); protected: friend class base::RefCountedThreadSafe<CloudPrintURLFetcher>; diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc index 1e2c053..4e61856 100644 --- a/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc +++ b/chrome/service/cloud_print/cloud_print_url_fetcher_unittest.cc @@ -80,7 +80,7 @@ class CloudPrintURLFetcherTest : public testing::Test, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); virtual void OnRequestAuthError() { @@ -128,7 +128,7 @@ class CloudPrintURLFetcherBasicTest : public CloudPrintURLFetcherTest { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); virtual CloudPrintURLFetcher::ResponseAction HandleRawData( @@ -201,7 +201,7 @@ CloudPrintURLFetcherTest::HandleRawResponse( 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 @@ -215,7 +215,7 @@ CloudPrintURLFetcherBasicTest::HandleRawResponse( 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 diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc index 60d75ed..20ea7f4 100644 --- a/chrome/service/cloud_print/printer_job_handler.cc +++ b/chrome/service/cloud_print/printer_job_handler.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. @@ -279,7 +279,7 @@ CloudPrintURLFetcher::ResponseAction PrinterJobHandler::HandleRawResponse( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { // 415 (Unsupported media type) error while fetching data from the server // means data conversion error. Stop fetching process and mark job as error. diff --git a/chrome/service/cloud_print/printer_job_handler.h b/chrome/service/cloud_print/printer_job_handler.h index 574f52b..8633875 100644 --- a/chrome/service/cloud_print/printer_job_handler.h +++ b/chrome/service/cloud_print/printer_job_handler.h @@ -132,7 +132,7 @@ class PrinterJobHandler : public base::RefCountedThreadSafe<PrinterJobHandler>, const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); virtual CloudPrintURLFetcher::ResponseAction HandleRawData( const URLFetcher* source, diff --git a/chrome/service/gaia/service_gaia_authenticator.cc b/chrome/service/gaia/service_gaia_authenticator.cc index af795a8..994d200 100644 --- a/chrome/service/gaia/service_gaia_authenticator.cc +++ b/chrome/service/gaia/service_gaia_authenticator.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. @@ -76,7 +76,7 @@ void ServiceGaiaAuthenticator::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK(io_message_loop_proxy_->BelongsToCurrentThread()); http_response_code_ = response_code; diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h index 62992a9..2010690 100644 --- a/chrome/service/gaia/service_gaia_authenticator.h +++ b/chrome/service/gaia/service_gaia_authenticator.h @@ -35,7 +35,7 @@ class ServiceGaiaAuthenticator const GURL &url, const net::URLRequestStatus &status, int response_code, - const ResponseCookies &cookies, + const net::ResponseCookies &cookies, const std::string &data); protected: diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc index 89bd656..b22cc03 100644 --- a/chrome/test/live_sync/live_sync_test.cc +++ b/chrome/test/live_sync/live_sync_test.cc @@ -11,11 +11,11 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" +#include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/values.h" -#include "base/synchronization/waitable_event.h" #include "chrome/browser/password_manager/encryptor.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -23,8 +23,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/net/url_fetcher.h" #include "chrome/common/net/test_url_fetcher_factory.h" +#include "chrome/common/net/url_fetcher.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/ui_test_utils.h" #include "content/browser/browser_thread.h" @@ -32,10 +32,10 @@ #include "googleurl/src/gurl.h" #include "net/base/escape.h" #include "net/base/network_change_notifier.h" -#include "net/test/test_server.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" +#include "net/test/test_server.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_status.h" @@ -66,7 +66,7 @@ class SyncServerStatusChecker : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { running_ = (status.status() == net::URLRequestStatus::SUCCESS && response_code == 200 && data.find("ok") == 0); diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc index 6437db6..6fa0546 100644 --- a/content/browser/geolocation/network_location_provider_unittest.cc +++ b/content/browser/geolocation/network_location_provider_unittest.cc @@ -432,7 +432,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) { "}"; fetcher->delegate()->OnURLFetchComplete( fetcher, test_server_url_, net::URLRequestStatus(), 200, // OK - ResponseCookies(), kNoFixNetworkResponse); + net::ResponseCookies(), kNoFixNetworkResponse); // This should have set the access token anyhow EXPECT_EQ(UTF8ToUTF16(REFERENCE_ACCESS_TOKEN), @@ -466,7 +466,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) { "}"; fetcher->delegate()->OnURLFetchComplete( fetcher, test_server_url_, net::URLRequestStatus(), 200, // OK - ResponseCookies(), kReferenceNetworkResponse); + net::ResponseCookies(), kReferenceNetworkResponse); provider->GetPosition(&position); EXPECT_EQ(51.0, position.latitude); @@ -505,7 +505,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) { fetcher, test_server_url_, net::URLRequestStatus(net::URLRequestStatus::FAILED, -1), 200, // should be ignored - ResponseCookies(), ""); + net::ResponseCookies(), ""); // Error means we now no longer have a fix. provider->GetPosition(&position); @@ -540,7 +540,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) { "}"; fetcher->delegate()->OnURLFetchComplete( fetcher, test_server_url_, net::URLRequestStatus(), 200, // OK - ResponseCookies(), kNoFixNetworkResponse); + net::ResponseCookies(), kNoFixNetworkResponse); // This should have set the access token anyhow EXPECT_EQ(UTF8ToUTF16(REFERENCE_ACCESS_TOKEN), @@ -575,7 +575,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) { "}"; fetcher->delegate()->OnURLFetchComplete( fetcher, test_server_url_, net::URLRequestStatus(), 200, // OK - ResponseCookies(), kReferenceNetworkResponse_1); + net::ResponseCookies(), kReferenceNetworkResponse_1); provider->GetPosition(&position); EXPECT_EQ(51.0, position.latitude); @@ -615,7 +615,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) { "}"; fetcher->delegate()->OnURLFetchComplete( fetcher, test_server_url_, net::URLRequestStatus(), 200, // OK - ResponseCookies(), kReferenceNetworkResponse_2); + net::ResponseCookies(), kReferenceNetworkResponse_2); provider->GetPosition(&position); EXPECT_EQ(51.1, position.latitude); @@ -648,7 +648,7 @@ TEST_F(GeolocationNetworkProviderTest, GatewayAndWifiScans) { "}"; fetcher->delegate()->OnURLFetchComplete( fetcher, test_server_url_, net::URLRequestStatus(), 200, // OK - ResponseCookies(), kReferenceNetworkResponse_3); + net::ResponseCookies(), kReferenceNetworkResponse_3); provider->GetPosition(&position); EXPECT_EQ(51.3, position.latitude); diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc index 74c9a0d..deedc92 100644 --- a/content/browser/geolocation/network_location_request.cc +++ b/content/browser/geolocation/network_location_request.cc @@ -122,7 +122,7 @@ void NetworkLocationRequest::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK_EQ(url_fetcher_.get(), source); DCHECK(url_.possibly_invalid_spec() == url.possibly_invalid_spec()); diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h index 18caaa5..bc5d346 100644 --- a/content/browser/geolocation/network_location_request.h +++ b/content/browser/geolocation/network_location_request.h @@ -71,7 +71,7 @@ class NetworkLocationRequest : private 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<net::URLRequestContextGetter> url_context_; diff --git a/content/browser/speech/speech_recognition_request.cc b/content/browser/speech/speech_recognition_request.cc index 6a4559f..239d51b 100644 --- a/content/browser/speech/speech_recognition_request.cc +++ b/content/browser/speech/speech_recognition_request.cc @@ -184,7 +184,7 @@ void SpeechRecognitionRequest::OnURLFetchComplete( const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data) { DCHECK_EQ(url_fetcher_.get(), source); diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h index 5b00563..9ca9670 100644 --- a/content/browser/speech/speech_recognition_request.h +++ b/content/browser/speech/speech_recognition_request.h @@ -65,7 +65,7 @@ class SpeechRecognitionRequest : public URLFetcher::Delegate { const GURL& url, const net::URLRequestStatus& status, int response_code, - const ResponseCookies& cookies, + const net::ResponseCookies& cookies, const std::string& data); private: diff --git a/content/browser/speech/speech_recognition_request_unittest.cc b/content/browser/speech/speech_recognition_request_unittest.cc index 1097709..0982453 100644 --- a/content/browser/speech/speech_recognition_request_unittest.cc +++ b/content/browser/speech/speech_recognition_request_unittest.cc @@ -54,10 +54,9 @@ void SpeechRecognitionRequestTest::CreateAndTestRequest( net::URLRequestStatus status; status.set_status(success ? net::URLRequestStatus::SUCCESS : net::URLRequestStatus::FAILED); - fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(), - status, success ? 200 : 500, - ResponseCookies(), - http_response); + fetcher->delegate()->OnURLFetchComplete( + fetcher, fetcher->original_url(), status, success ? 200 : 500, + net::ResponseCookies(), http_response); // Parsed response will be available in result_. } diff --git a/content/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc index 7239582..5e5ce8e 100644 --- a/content/browser/speech/speech_recognizer_unittest.cc +++ b/content/browser/speech/speech_recognizer_unittest.cc @@ -173,7 +173,7 @@ TEST_F(SpeechRecognizerTest, StopWithData) { net::URLRequestStatus status; status.set_status(net::URLRequestStatus::SUCCESS); fetcher->delegate()->OnURLFetchComplete( - fetcher, fetcher->original_url(), status, 200, ResponseCookies(), + fetcher, fetcher->original_url(), status, 200, net::ResponseCookies(), "{\"hypotheses\":[{\"utterance\":\"123\"}]}"); EXPECT_TRUE(recognition_complete_); EXPECT_TRUE(result_received_); @@ -223,8 +223,8 @@ TEST_F(SpeechRecognizerTest, ConnectionError) { net::URLRequestStatus status; status.set_status(net::URLRequestStatus::FAILED); status.set_os_error(net::ERR_CONNECTION_REFUSED); - fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(), - status, 0, ResponseCookies(), ""); + fetcher->delegate()->OnURLFetchComplete( + fetcher, fetcher->original_url(), status, 0, net::ResponseCookies(), ""); EXPECT_FALSE(recognition_complete_); EXPECT_FALSE(result_received_); EXPECT_EQ(SpeechRecognizer::RECOGNIZER_ERROR_NETWORK, error_); @@ -254,7 +254,7 @@ TEST_F(SpeechRecognizerTest, ServerError) { net::URLRequestStatus status; status.set_status(net::URLRequestStatus::SUCCESS); fetcher->delegate()->OnURLFetchComplete(fetcher, fetcher->original_url(), - status, 500, ResponseCookies(), + status, 500, net::ResponseCookies(), "Internal Server Error"); EXPECT_FALSE(recognition_complete_); EXPECT_FALSE(result_received_); diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h index 2ad1162..1971426 100644 --- a/net/url_request/url_request.h +++ b/net/url_request/url_request.h @@ -31,11 +31,6 @@ class Time; class FilePath; -// This stores the values of the Set-Cookie headers received during the request. -// Each item in the vector corresponds to a Set-Cookie: line received, -// excluding the "Set-Cookie:" part. -typedef std::vector<std::string> ResponseCookies; - namespace net { class CookieOptions; @@ -47,6 +42,11 @@ class URLRequestContext; class URLRequestJob; class X509Certificate; +// This stores the values of the Set-Cookie headers received during the request. +// Each item in the vector corresponds to a Set-Cookie: line received, +// excluding the "Set-Cookie:" part. +typedef std::vector<std::string> ResponseCookies; + //----------------------------------------------------------------------------- // A class representing the asynchronous load of a data stream from an URL. // |