diff options
18 files changed, 252 insertions, 176 deletions
diff --git a/chrome/browser/chromeos/login/eula_browsertest.cc b/chrome/browser/chromeos/login/eula_browsertest.cc index e1cb49f..c760cc2 100644 --- a/chrome/browser/chromeos/login/eula_browsertest.cc +++ b/chrome/browser/chromeos/login/eula_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "content/public/test/browser_test_utils.h" #include "net/http/http_response_headers.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "testing/gmock/include/gmock/gmock.h" @@ -35,9 +36,9 @@ class TestURLFetcherCallback { const GURL& url, net::URLFetcherDelegate* d, const std::string& response_data, - bool success) { + net::HttpStatusCode response_code) { scoped_ptr<net::FakeURLFetcher> fetcher( - new net::FakeURLFetcher(url, d, response_data, success)); + new net::FakeURLFetcher(url, d, response_data, response_code)); OnRequestCreate(url, fetcher.get()); return fetcher.Pass(); } @@ -59,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(TermsOfServiceProcessBrowserTest, LoadOnline) { NULL, base::Bind(&TestURLFetcherCallback::CreateURLFetcher, base::Unretained(&url_callback))); - factory.SetFakeResponse(GURL(kEULAURL), kFakeOnlineEULA, true); + factory.SetFakeResponse(GURL(kEULAURL), kFakeOnlineEULA, net::HTTP_OK); EXPECT_CALL(url_callback, OnRequestCreate(GURL(kEULAURL), _)) .Times(Exactly(1)) .WillRepeatedly(Invoke(AddMimeHeader)); @@ -79,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(TermsOfServiceProcessBrowserTest, LoadOnline) { // Make sure offline version is shown. IN_PROC_BROWSER_TEST_F(TermsOfServiceProcessBrowserTest, LoadOffline) { net::FakeURLFetcherFactory factory(NULL); - factory.SetFakeResponse(GURL(kEULAURL), "", false); + factory.SetFakeResponse(GURL(kEULAURL), "", net::HTTP_INTERNAL_SERVER_ERROR); ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUITermsURL)); content::WebContents* web_contents = diff --git a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc index acfd274f..d795fc5 100644 --- a/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc +++ b/chrome/browser/chromeos/policy/cloud_external_data_manager_base_unittest.cc @@ -24,6 +24,7 @@ #include "chrome/browser/policy/external_data_fetcher.h" #include "chrome/browser/policy/policy_map.h" #include "chrome/browser/policy/policy_types.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_fetcher_delegate.h" @@ -125,7 +126,7 @@ class CloudExternalDataManagerBaseTest : public testing::Test { void SetFakeResponse(const std::string& url, const std::string& repsonse_data, - bool success); + net::HttpStatusCode response_code); base::MessageLoop message_loop_; base::ScopedTempDir temp_dir_; @@ -236,8 +237,8 @@ void CloudExternalDataManagerBaseTest::FetchAll() { void CloudExternalDataManagerBaseTest::SetFakeResponse( const std::string& url, const std::string& response_data, - bool success) { - fetcher_factory_.SetFakeResponse(GURL(url), response_data, success); + net::HttpStatusCode response_code) { + fetcher_factory_.SetFakeResponse(GURL(url), response_data, response_code); } // Verifies that when no valid external data reference has been set for a @@ -283,7 +284,7 @@ TEST_F(CloudExternalDataManagerBaseTest, FailToFetchInvalid) { // further download attempts. TEST_F(CloudExternalDataManagerBaseTest, DownloadAndCache) { // Serve valid external data for |k10BytePolicy|. - SetFakeResponse(k10BytePolicyURL, k10ByteData, true); + SetFakeResponse(k10BytePolicyURL, k10ByteData, net::HTTP_OK); external_data_manager_->Connect(request_content_getter_); // Retrieve external data for |k10BytePolicy|. Verify that a download happens @@ -338,8 +339,8 @@ TEST_F(CloudExternalDataManagerBaseTest, DownloadAndCache) { // served from the cache without further download attempts. TEST_F(CloudExternalDataManagerBaseTest, DownloadAndCacheAll) { // Serve valid external data for |k10BytePolicy| and |k20BytePolicy|. - SetFakeResponse(k10BytePolicyURL, k10ByteData, true); - SetFakeResponse(k20BytePolicyURL, k20ByteData, true); + SetFakeResponse(k10BytePolicyURL, k10ByteData, net::HTTP_OK); + SetFakeResponse(k20BytePolicyURL, k20ByteData, net::HTTP_OK); external_data_manager_->Connect(request_content_getter_); // Request that external data referenced by all policies be downloaded. @@ -407,7 +408,7 @@ TEST_F(CloudExternalDataManagerBaseTest, DownloadAfterConnect) { // Serve valid external data for |k10BytePolicy| and allow the // external_data_manager_ to perform downloads. - SetFakeResponse(k10BytePolicyURL, k10ByteData, true); + SetFakeResponse(k10BytePolicyURL, k10ByteData, net::HTTP_OK); external_data_manager_->Connect(request_content_getter_); // Verify that a download happens and the callback is invoked with the @@ -425,7 +426,8 @@ TEST_F(CloudExternalDataManagerBaseTest, DownloadAfterConnect) { TEST_F(CloudExternalDataManagerBaseTest, DownloadError) { // Make attempts to download the external data for |k20BytePolicy| fail with // an error. - SetFakeResponse(k20BytePolicyURL, std::string(), false); + SetFakeResponse(k20BytePolicyURL, std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); external_data_manager_->Connect(request_content_getter_); // Attempt to retrieve external data for |k20BytePolicy|. Verify that the @@ -460,7 +462,7 @@ TEST_F(CloudExternalDataManagerBaseTest, DownloadError) { // Serve external data for |k20BytePolicy| that does not match the hash // specified in its current external data reference. - SetFakeResponse(k20BytePolicyURL, k10ByteData, true); + SetFakeResponse(k20BytePolicyURL, k10ByteData, net::HTTP_OK); // Attempt to retrieve external data for |k20BytePolicy| again. Verify that // no callback is invoked still as the downloaded succeeds but returns data @@ -629,7 +631,7 @@ TEST_F(CloudExternalDataManagerBaseTest, CacheCorruption) { SetUpExternalDataManager(); // Serve external data for |k10BytePolicy| that exceeds the maximal external // data size allowed for that policy. - SetFakeResponse(k10BytePolicyURL, k20ByteData, true); + SetFakeResponse(k10BytePolicyURL, k20ByteData, net::HTTP_OK); external_data_manager_->Connect(request_content_getter_); // Modify the external data reference for |k10BytePolicy| to match the @@ -648,7 +650,7 @@ TEST_F(CloudExternalDataManagerBaseTest, CacheCorruption) { ResetCallbackData(); // Serve valid external data for |k20BytePolicy|. - SetFakeResponse(k20BytePolicyURL, k20ByteData, true); + SetFakeResponse(k20BytePolicyURL, k20ByteData, net::HTTP_OK); // Retrieve external data for |k20BytePolicy|. Verify that the callback is // invoked with the valid downloaded data, not the invalid data in the cache. @@ -689,8 +691,10 @@ TEST_F(CloudExternalDataManagerBaseTest, CacheCorruption) { TEST_F(CloudExternalDataManagerBaseTest, PolicyChangeWhileDownloadPending) { // Make attempts to download the external data for |k10BytePolicy| and // |k20BytePolicy| fail with an error. - SetFakeResponse(k10BytePolicyURL, std::string(), false); - SetFakeResponse(k20BytePolicyURL, std::string(), false); + SetFakeResponse(k10BytePolicyURL, std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); + SetFakeResponse(k20BytePolicyURL, std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); external_data_manager_->Connect(request_content_getter_); // Attempt to retrieve external data for |k10BytePolicy| and |k20BytePolicy|. @@ -715,7 +719,7 @@ TEST_F(CloudExternalDataManagerBaseTest, PolicyChangeWhileDownloadPending) { // Serve valid external data for |k20BytePolicy|. fetcher_factory_.ClearFakeResponses(); - SetFakeResponse(k20BytePolicyURL, k10ByteData, true); + SetFakeResponse(k20BytePolicyURL, k10ByteData, net::HTTP_OK); // Modify the external data reference for |k20BytePolicy| to match the // external data now being served. Verify that the callback is invoked with diff --git a/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc b/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc index 7136525..d81df86 100644 --- a/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc +++ b/chrome/browser/local_discovery/cloud_print_printer_list_unittest.cc @@ -12,6 +12,7 @@ #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/http/http_request_headers.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_impl.h" #include "net/url_request/url_request_test_util.h" @@ -106,7 +107,7 @@ TEST_F(CloudPrintPrinterListTest, SuccessOAuth2) { fetcher_factory_->SetFakeResponse( GURL("http://SoMeUrL.com/cloudprint/search"), kSampleSuccessResponseOAuth, - true); + net::HTTP_OK); CloudPrintBaseApiFlow* cloudprint_flow = printer_list_->GetOAuth2ApiFlowForTests(); diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc index 5ef0a75..0796606 100644 --- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc +++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc @@ -24,6 +24,7 @@ #include "net/base/host_port_pair.h" #include "net/http/http_auth.h" #include "net/http/http_auth_cache.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -118,10 +119,11 @@ void DataReductionProxySettingsTestBase::SetProbeResult( } else { EXPECT_CALL(*settings, GetURLFetcher()) .Times(expected_calls) - .WillRepeatedly(Return(new net::FakeURLFetcher(GURL(test_url), - settings, - response, - success))); + .WillRepeatedly(Return(new net::FakeURLFetcher( + GURL(test_url), + settings, + response, + success ? net::HTTP_OK : net::HTTP_INTERNAL_SERVER_ERROR))); } } diff --git a/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher_browsertest.cc b/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher_browsertest.cc index afc8d61..4479eed 100644 --- a/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher_browsertest.cc +++ b/chrome/browser/notifications/sync_notifier/notification_bitmap_fetcher_browsertest.cc @@ -9,6 +9,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_utils.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" #include "testing/gtest/include/gtest/gtest.h" @@ -104,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(NotificationBitmapFetcherBrowserTest, NotificationBitmapFetcher fetcher(url, &delegate); - url_fetcher_factory_->SetFakeResponse(url, image_string, true); + url_fetcher_factory_->SetFakeResponse(url, image_string, net::HTTP_OK); // We expect that the image decoder will get called and return // an image in a callback to OnImageDecoded(). @@ -154,7 +155,9 @@ IN_PROC_BROWSER_TEST_F(NotificationBitmapFetcherBrowserTest, NotificationBitmapFetcher fetcher(url, &delegate); - url_fetcher_factory_->SetFakeResponse(url, std::string(), false); + url_fetcher_factory_->SetFakeResponse(url, + std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); fetcher.Start(browser()->profile()); @@ -170,7 +173,7 @@ IN_PROC_BROWSER_TEST_F(NotificationBitmapFetcherBrowserTest, NotificationBitmapFetcherTestDelegate delegate(kAsyncCall); NotificationBitmapFetcher fetcher(url, &delegate); url_fetcher_factory_->SetFakeResponse( - url, std::string("Not a real bitmap"), true); + url, std::string("Not a real bitmap"), net::HTTP_OK); fetcher.Start(browser()->profile()); diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc index 5c238f3..27d6df8 100644 --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc @@ -28,6 +28,7 @@ #include "content/public/test/test_browser_thread.h" #include "extensions/common/manifest_constants.h" #include "net/http/http_response_headers.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "url/gurl.h" @@ -173,7 +174,7 @@ class ConfigParserTest : public testing::Test { const GURL& url, net::URLFetcherDelegate* fetcher_delegate, const std::string& response_data, - bool success); + net::HttpStatusCode response_code); MOCK_METHOD0(Callback, void(void)); @@ -213,10 +214,13 @@ scoped_ptr<net::FakeURLFetcher> ConfigParserTest::CreateFakeURLFetcher( const GURL& url, net::URLFetcherDelegate* fetcher_delegate, const std::string& response_data, - bool success) { + net::HttpStatusCode response_code) { request_listener_.real_delegate = fetcher_delegate; scoped_ptr<net::FakeURLFetcher> fetcher( - new net::FakeURLFetcher(url, &request_listener_, response_data, success)); + new net::FakeURLFetcher(url, + &request_listener_, + response_data, + response_code)); scoped_refptr<net::HttpResponseHeaders> download_headers = new net::HttpResponseHeaders(""); download_headers->AddHeader("Content-Type: text/xml"); @@ -649,7 +653,7 @@ TEST_F(ProfileResetterTest, ResetFewFlags) { // Tries to load unavailable config file. TEST_F(ConfigParserTest, NoConnectivity) { const GURL url("http://test"); - factory().SetFakeResponse(url, "", false); + factory().SetFakeResponse(url, "", net::HTTP_INTERNAL_SERVER_ERROR); scoped_ptr<BrandcodeConfigFetcher> fetcher = WaitForRequest(GURL(url)); EXPECT_FALSE(fetcher->GetSettings()); @@ -663,7 +667,7 @@ TEST_F(ConfigParserTest, ParseConfig) { ReplaceString(&xml_config, "placeholder_for_id", "abbaabbaabbaabbaabbaabbaabbaabba"); - factory().SetFakeResponse(url, xml_config, true); + factory().SetFakeResponse(url, xml_config, net::HTTP_OK); scoped_ptr<BrandcodeConfigFetcher> fetcher = WaitForRequest(GURL(url)); scoped_ptr<BrandcodedDefaultSettings> settings = fetcher->GetSettings(); diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc index e32dcc4..9d124b5 100644 --- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc @@ -17,6 +17,7 @@ #include "chrome/common/safe_browsing/csd.pb.h" #include "content/public/test/test_browser_thread.h" #include "crypto/sha2.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" @@ -105,25 +106,29 @@ class ClientSideDetectionServiceTest : public testing::Test { return is_malware_; } - void SetModelFetchResponse(std::string response_data, bool success) { + void SetModelFetchResponse(std::string response_data, + net::HttpStatusCode response_code) { factory_->SetFakeResponse(GURL(ClientSideDetectionService::kClientModelUrl), - response_data, success); + response_data, + response_code); } void SetClientReportPhishingResponse(std::string response_data, - bool success) { + net::HttpStatusCode response_code) { factory_->SetFakeResponse( ClientSideDetectionService::GetClientReportUrl( ClientSideDetectionService::kClientReportPhishingUrl), - response_data, success); + response_data, + response_code); } void SetClientReportMalwareResponse(std::string response_data, - bool success) { + net::HttpStatusCode response_code) { factory_->SetFakeResponse( ClientSideDetectionService::GetClientReportUrl( ClientSideDetectionService::kClientReportMalwareUrl), - response_data, success); + response_data, + response_code); } int GetNumReports(std::queue<base::Time>* report_times) { @@ -255,7 +260,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { service.SetEnabledAndRefreshState(true); // The model fetch failed. - SetModelFetchResponse("blamodel", false /* failure */); + SetModelFetchResponse("blamodel", net::HTTP_INTERNAL_SERVER_ERROR); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_FETCH_FAILED)) .WillOnce(QuitCurrentMessageLoop()); @@ -264,7 +269,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { Mock::VerifyAndClearExpectations(&service); // Empty model file. - SetModelFetchResponse(std::string(), true /* success */); + SetModelFetchResponse(std::string(), net::HTTP_OK); EXPECT_CALL(service, EndFetchModel(ClientSideDetectionService::MODEL_EMPTY)) .WillOnce(QuitCurrentMessageLoop()); service.StartFetchModel(); @@ -274,7 +279,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { // Model is too large. SetModelFetchResponse( std::string(ClientSideDetectionService::kMaxModelSizeBytes + 1, 'x'), - true /* success */); + net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_TOO_LARGE)) .WillOnce(QuitCurrentMessageLoop()); @@ -283,7 +288,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { Mock::VerifyAndClearExpectations(&service); // Unable to parse the model file. - SetModelFetchResponse("Invalid model file", true /* success */); + SetModelFetchResponse("Invalid model file", net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_PARSE_ERROR)) .WillOnce(QuitCurrentMessageLoop()); @@ -294,7 +299,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { // Model that is missing some required fields (missing the version field). ClientSideModel model; model.set_max_words_per_term(4); - SetModelFetchResponse(model.SerializePartialAsString(), true /* success */); + SetModelFetchResponse(model.SerializePartialAsString(), net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_MISSING_FIELDS)) .WillOnce(QuitCurrentMessageLoop()); @@ -306,7 +311,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { model.set_version(10); model.add_hashes("bla"); model.add_page_term(1); // Should be 0 instead of 1. - SetModelFetchResponse(model.SerializePartialAsString(), true /* success */); + SetModelFetchResponse(model.SerializePartialAsString(), net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_BAD_HASH_IDS)) .WillOnce(QuitCurrentMessageLoop()); @@ -317,7 +322,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { // Model version number is wrong. model.set_version(-1); - SetModelFetchResponse(model.SerializeAsString(), true /* success */); + SetModelFetchResponse(model.SerializeAsString(), net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_INVALID_VERSION_NUMBER)) .WillOnce(QuitCurrentMessageLoop()); @@ -327,7 +332,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { // Normal model. model.set_version(10); - SetModelFetchResponse(model.SerializeAsString(), true /* success */); + SetModelFetchResponse(model.SerializeAsString(), net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_SUCCESS)) .WillOnce(QuitCurrentMessageLoop()); @@ -339,7 +344,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { // model that is currently loaded in the service object to 11. service.model_.reset(new ClientSideModel(model)); service.model_->set_version(11); - SetModelFetchResponse(model.SerializeAsString(), true /* success */); + SetModelFetchResponse(model.SerializeAsString(), net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_INVALID_VERSION_NUMBER)) .WillOnce(QuitCurrentMessageLoop()); @@ -349,7 +354,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { // Model version hasn't changed since the last reload. service.model_->set_version(10); - SetModelFetchResponse(model.SerializeAsString(), true /* success */); + SetModelFetchResponse(model.SerializeAsString(), net::HTTP_OK); EXPECT_CALL(service, EndFetchModel( ClientSideDetectionService::MODEL_NOT_CHANGED)) .WillOnce(QuitCurrentMessageLoop()); @@ -359,7 +364,7 @@ TEST_F(ClientSideDetectionServiceTest, FetchModelTest) { } TEST_F(ClientSideDetectionServiceTest, ServiceObjectDeletedBeforeCallbackDone) { - SetModelFetchResponse("bogus model", true /* success */); + SetModelFetchResponse("bogus model", net::HTTP_OK); csd_service_.reset(ClientSideDetectionService::Create(NULL)); csd_service_->SetEnabledAndRefreshState(true); EXPECT_TRUE(csd_service_.get() != NULL); @@ -372,7 +377,7 @@ TEST_F(ClientSideDetectionServiceTest, ServiceObjectDeletedBeforeCallbackDone) { } TEST_F(ClientSideDetectionServiceTest, SendClientReportPhishingRequest) { - SetModelFetchResponse("bogus model", true /* success */); + SetModelFetchResponse("bogus model", net::HTTP_OK); csd_service_.reset(ClientSideDetectionService::Create(NULL)); csd_service_->SetEnabledAndRefreshState(true); @@ -382,21 +387,21 @@ TEST_F(ClientSideDetectionServiceTest, SendClientReportPhishingRequest) { base::Time before = base::Time::Now(); // Invalid response body from the server. - SetClientReportPhishingResponse("invalid proto response", true /* success */); + SetClientReportPhishingResponse("invalid proto response", net::HTTP_OK); EXPECT_FALSE(SendClientReportPhishingRequest(url, score)); // Normal behavior. ClientPhishingResponse response; response.set_phishy(true); SetClientReportPhishingResponse(response.SerializeAsString(), - true /* success */); + net::HTTP_OK); EXPECT_TRUE(SendClientReportPhishingRequest(url, score)); // This request will fail GURL second_url("http://b.com/"); response.set_phishy(false); SetClientReportPhishingResponse(response.SerializeAsString(), - false /* success */); + net::HTTP_INTERNAL_SERVER_ERROR); EXPECT_FALSE(SendClientReportPhishingRequest(second_url, score)); base::Time after = base::Time::Now(); @@ -420,38 +425,38 @@ TEST_F(ClientSideDetectionServiceTest, SendClientReportPhishingRequest) { } TEST_F(ClientSideDetectionServiceTest, SendClientReportMalwareRequest) { - SetModelFetchResponse("bogus model", true /* success */); + SetModelFetchResponse("bogus model", net::HTTP_OK); csd_service_.reset(ClientSideDetectionService::Create(NULL)); csd_service_->SetEnabledAndRefreshState(true); GURL url("http://a.com/"); base::Time before = base::Time::Now(); // Invalid response body from the server. - SetClientReportMalwareResponse("invalid proto response", true /* success */); + SetClientReportMalwareResponse("invalid proto response", net::HTTP_OK); EXPECT_FALSE(SendClientReportMalwareRequest(url)); // Missing bad_url. ClientMalwareResponse response; response.set_blacklist(true); - SetClientReportMalwareResponse(response.SerializeAsString(), true); + SetClientReportMalwareResponse(response.SerializeAsString(), net::HTTP_OK); EXPECT_FALSE(SendClientReportMalwareRequest(url)); // Normal behavior. response.set_blacklist(true); response.set_bad_url("http://response-bad.com/"); - SetClientReportMalwareResponse(response.SerializeAsString(), true); + SetClientReportMalwareResponse(response.SerializeAsString(), net::HTTP_OK); EXPECT_TRUE(SendClientReportMalwareRequest(url)); CheckConfirmedMalwareUrl(GURL("http://response-bad.com/")); // This request will fail response.set_blacklist(false); SetClientReportMalwareResponse(response.SerializeAsString(), - false /* success */); + net::HTTP_INTERNAL_SERVER_ERROR); EXPECT_FALSE(SendClientReportMalwareRequest(url)); // server blacklist decision is false, and response is succesful response.set_blacklist(false); - SetClientReportMalwareResponse(response.SerializeAsString(), true); + SetClientReportMalwareResponse(response.SerializeAsString(), net::HTTP_OK); EXPECT_FALSE(SendClientReportMalwareRequest(url)); // Check that we have recorded all 4 requests within the correct time range. @@ -461,7 +466,7 @@ TEST_F(ClientSideDetectionServiceTest, SendClientReportMalwareRequest) { // Another normal behavior will fail because of the limit is hit response.set_blacklist(true); - SetClientReportMalwareResponse(response.SerializeAsString(), true); + SetClientReportMalwareResponse(response.SerializeAsString(), net::HTTP_OK); EXPECT_FALSE(SendClientReportMalwareRequest(url)); report_times = GetMalwareReportTimes(); @@ -475,7 +480,7 @@ TEST_F(ClientSideDetectionServiceTest, SendClientReportMalwareRequest) { } TEST_F(ClientSideDetectionServiceTest, GetNumReportTest) { - SetModelFetchResponse("bogus model", true /* success */); + SetModelFetchResponse("bogus model", net::HTTP_OK); csd_service_.reset(ClientSideDetectionService::Create(NULL)); std::queue<base::Time>& report_times = GetPhishingReportTimes(); @@ -490,14 +495,14 @@ TEST_F(ClientSideDetectionServiceTest, GetNumReportTest) { } TEST_F(ClientSideDetectionServiceTest, CacheTest) { - SetModelFetchResponse("bogus model", true /* success */); + SetModelFetchResponse("bogus model", net::HTTP_OK); csd_service_.reset(ClientSideDetectionService::Create(NULL)); TestCache(); } TEST_F(ClientSideDetectionServiceTest, IsPrivateIPAddress) { - SetModelFetchResponse("bogus model", true /* success */); + SetModelFetchResponse("bogus model", net::HTTP_OK); csd_service_.reset(ClientSideDetectionService::Create(NULL)); EXPECT_TRUE(csd_service_->IsPrivateIPAddress("10.1.2.3")); @@ -708,7 +713,7 @@ TEST_F(ClientSideDetectionServiceTest, SetEnabledAndRefreshState) { ClientSideModel model; model.set_version(10); model.set_max_words_per_term(4); - SetModelFetchResponse(model.SerializeAsString(), true /* success */); + SetModelFetchResponse(model.SerializeAsString(), net::HTTP_OK); EXPECT_CALL(*service, ScheduleFetchModel(_)) .WillOnce(Invoke(service, &MockClientSideDetectionService::Schedule)); EXPECT_CALL(*service, EndFetchModel( @@ -741,7 +746,7 @@ TEST_F(ClientSideDetectionServiceTest, SetEnabledAndRefreshState) { ClientPhishingResponse response; response.set_phishy(true); SetClientReportPhishingResponse(response.SerializeAsString(), - true /* success */); + net::HTTP_OK); EXPECT_FALSE(SendClientReportPhishingRequest(GURL("http://a.com/"), 0.4f)); // Pending requests also return false if the service is disabled before they diff --git a/chrome/browser/safe_browsing/download_protection_service_unittest.cc b/chrome/browser/safe_browsing/download_protection_service_unittest.cc index 2c08bcd..9954fd1 100644 --- a/chrome/browser/safe_browsing/download_protection_service_unittest.cc +++ b/chrome/browser/safe_browsing/download_protection_service_unittest.cc @@ -29,6 +29,7 @@ #include "content/public/test/mock_download_item.h" #include "content/public/test/test_browser_thread_bundle.h" #include "net/cert/x509_certificate.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_delegate.h" #include "testing/gmock/include/gmock/gmock.h" @@ -400,7 +401,9 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadFetchFailed) { net::FakeURLFetcherFactory factory(NULL); // HTTP request will fail. factory.SetFakeResponse( - DownloadProtectionService::GetDownloadRequestUrl(), std::string(), false); + DownloadProtectionService::GetDownloadRequestUrl(), + std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); base::FilePath a_tmp(FILE_PATH_LITERAL("a.tmp")); base::FilePath a_exe(FILE_PATH_LITERAL("a.exe")); @@ -442,7 +445,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadSuccess) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); base::FilePath a_tmp(FILE_PATH_LITERAL("a.tmp")); base::FilePath a_exe(FILE_PATH_LITERAL("a.exe")); @@ -480,7 +483,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadSuccess) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializePartialAsString(), - true); + net::HTTP_OK); download_service_->CheckClientDownload( &item, @@ -498,7 +501,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadSuccess) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); download_service_->CheckClientDownload( &item, @@ -518,7 +521,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadSuccess) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); download_service_->CheckClientDownload( &item, @@ -543,7 +546,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadSuccess) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); download_service_->CheckClientDownload( &item, @@ -565,7 +568,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadSuccess) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); download_service_->CheckClientDownload( &item, @@ -586,7 +589,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadHTTPS) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); base::FilePath a_tmp(FILE_PATH_LITERAL("a.tmp")); base::FilePath a_exe(FILE_PATH_LITERAL("a.exe")); @@ -632,7 +635,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadZip) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); base::ScopedTempDir download_dir; ASSERT_TRUE(download_dir.CreateUniqueTempDir()); @@ -699,7 +702,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientDownloadZip) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); download_service_->CheckClientDownload( &item, @@ -762,7 +765,7 @@ TEST_F(DownloadProtectionServiceTest, CheckClientCrxDownloadSuccess) { factory.SetFakeResponse( DownloadProtectionService::GetDownloadRequestUrl(), response.SerializeAsString(), - true); + net::HTTP_OK); base::FilePath a_tmp(FILE_PATH_LITERAL("a.tmp")); base::FilePath a_crx(FILE_PATH_LITERAL("a.crx")); diff --git a/chrome/browser/signin/signin_browsertest.cc b/chrome/browser/signin/signin_browsertest.cc index f85b8bd..aebd1f8 100644 --- a/chrome/browser/signin/signin_browsertest.cc +++ b/chrome/browser/signin/signin_browsertest.cc @@ -25,6 +25,7 @@ #include "content/public/browser/web_contents_observer.h" #include "content/public/common/content_switches.h" #include "google_apis/gaia/gaia_urls.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" namespace { @@ -56,8 +57,10 @@ class SigninBrowserTest : public InProcessBrowserTest { fake_factory_->SetFakeResponse( GaiaUrls::GetInstance()->service_login_url(), std::string(), - true); - fake_factory_->SetFakeResponse(GURL(kNonSigninURL), std::string(), true); + net::HTTP_OK); + fake_factory_->SetFakeResponse(GURL(kNonSigninURL), + std::string(), + net::HTTP_OK); // Yield control back to the InProcessBrowserTest framework. InProcessBrowserTest::SetUp(); } diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index 217c31d..28e1e64 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -48,6 +48,7 @@ #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/base/network_change_notifier.h" +#include "net/http/http_status_code.h" #include "net/proxy/proxy_config.h" #include "net/proxy/proxy_config_service_fixed.h" #include "net/proxy/proxy_service.h" @@ -429,23 +430,23 @@ void SyncTest::SetupMockGaiaResponses() { fake_factory_->SetFakeResponse( GaiaUrls::GetInstance()->client_login_url(), "SID=sid\nLSID=lsid", - true); + net::HTTP_OK); fake_factory_->SetFakeResponse( GaiaUrls::GetInstance()->get_user_info_url(), "email=user@gmail.com\ndisplayEmail=user@gmail.com", - true); + net::HTTP_OK); fake_factory_->SetFakeResponse( GaiaUrls::GetInstance()->issue_auth_token_url(), "auth", - true); + net::HTTP_OK); fake_factory_->SetFakeResponse( GURL(GoogleURLTracker::kSearchDomainCheckURL), ".google.com", - true); + net::HTTP_OK); fake_factory_->SetFakeResponse( GaiaUrls::GetInstance()->client_login_to_oauth2_url(), "some_response", - true); + net::HTTP_OK); fake_factory_->SetFakeResponse( GaiaUrls::GetInstance()->oauth2_token_url(), "{" @@ -454,11 +455,11 @@ void SyncTest::SetupMockGaiaResponses() { " \"expires_in\": 3600," " \"token_type\": \"Bearer\"" "}", - true); + net::HTTP_OK); fake_factory_->SetFakeResponse( GaiaUrls::GetInstance()->oauth1_login_url(), "SID=sid\nLSID=lsid\nAuth=auth_token", - true); + net::HTTP_OK); } void SyncTest::ClearMockGaiaResponses() { diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc index 31aacb7..97879d2 100644 --- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc @@ -76,6 +76,7 @@ #include "content/public/test/test_utils.h" #include "grit/generated_resources.h" #include "net/base/network_change_notifier.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher_impl.h" #include "testing/gmock/include/gmock/gmock.h" @@ -923,7 +924,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest, SetPrefetchQuery) { "{\"google:clientdata\":{\"phi\": 0}," "\"google:suggesttype\":[\"QUERY\", \"QUERY\"]," "\"google:suggestrelevance\":[1400, 9]}]", - true); + net::HTTP_OK); SetOmniboxText("pupp"); while (!omnibox()->model()->autocomplete_controller()->done()) { @@ -968,7 +969,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedPrefetchTest, ClearPrefetchedResults) { "[\"dogs\",[\"https://dogs.com\"],[],[]," "{\"google:suggesttype\":[\"NAVIGATION\"]," "\"google:suggestrelevance\":[2]}]", - true); + net::HTTP_OK); SetOmniboxText("dogs"); while (!omnibox()->model()->autocomplete_controller()->done()) { diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index 7de4af0..87d26e0 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc @@ -20,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.cc" #include "chrome/test/base/web_ui_browsertest.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" @@ -292,11 +293,11 @@ class MockableFakeURLFetcherCreator { scoped_ptr<net::FakeURLFetcher> CreateFakeURLFetcher( const GURL& url, net::URLFetcherDelegate* delegate, - const std::string& response, - bool success) { + const std::string& response_data, + net::HttpStatusCode response_code) { OnCreateFakeURLFetcher(url.spec()); return scoped_ptr<net::FakeURLFetcher>( - new net::FakeURLFetcher(url, delegate, response, success)); + new net::FakeURLFetcher(url, delegate, response_data, response_code)); } net::FakeURLFetcherFactory::FakeURLFetcherCreator callback() { @@ -336,32 +337,32 @@ class LocalDiscoveryUITest : public WebUIBrowserTest { fake_fetcher_factory().SetFakeResponse( GURL(kURLInfo), kResponseInfo, - true); + net::HTTP_OK); fake_fetcher_factory().SetFakeResponse( GURL(kURLRegisterStart), kResponseRegisterStart, - true); + net::HTTP_OK); fake_fetcher_factory().SetFakeResponse( GURL(kURLRegisterClaimToken), kResponseRegisterClaimTokenNoConfirm, - true); + net::HTTP_OK); fake_fetcher_factory().SetFakeResponse( GURL(kURLCloudPrintConfirm), kResponseCloudPrintConfirm, - true); + net::HTTP_OK); fake_fetcher_factory().SetFakeResponse( GURL(kURLRegisterComplete), kResponseRegisterComplete, - true); + net::HTTP_OK); fake_fetcher_factory().SetFakeResponse( GURL(kURLGaiaToken), kResponseGaiaToken, - true); + net::HTTP_OK); EXPECT_CALL(fake_url_fetcher_creator(), OnCreateFakeURLFetcher( kURLGaiaToken)) @@ -481,12 +482,12 @@ IN_PROC_BROWSER_TEST_F(LocalDiscoveryUITest, RegisterTest) { fake_fetcher_factory().SetFakeResponse( GURL(kURLRegisterClaimToken), kResponseRegisterClaimTokenConfirm, - true); + net::HTTP_OK); fake_fetcher_factory().SetFakeResponse( GURL(kURLInfo), kResponseInfoWithID, - true); + net::HTTP_OK); { InSequence s; diff --git a/chrome/service/cloud_print/printer_job_handler_unittest.cc b/chrome/service/cloud_print/printer_job_handler_unittest.cc index 20f8027..ff401d5 100644 --- a/chrome/service/cloud_print/printer_job_handler_unittest.cc +++ b/chrome/service/cloud_print/printer_job_handler_unittest.cc @@ -15,6 +15,7 @@ #include "chrome/service/cloud_print/print_system.h" #include "chrome/service/cloud_print/printer_job_handler.h" #include "net/http/http_response_headers.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" #include "printing/backend/print_backend.h" @@ -281,9 +282,9 @@ class TestURLFetcherCallback { const GURL& url, net::URLFetcherDelegate* d, const std::string& response_data, - bool success) { + net::HttpStatusCode response_code) { scoped_ptr<net::FakeURLFetcher> fetcher( - new net::FakeURLFetcher(url, d, response_data, success)); + new net::FakeURLFetcher(url, d, response_data, response_code)); OnRequestCreate(url, fetcher.get()); return fetcher.Pass(); } @@ -497,11 +498,11 @@ void PrinterJobHandlerTest::SetUp() { void PrinterJobHandlerTest::MakeJobFetchReturnNoJobs() { factory_.SetFakeResponse(JobListURI(kJobFetchReasonStartup), - JobListResponse(0), true); + JobListResponse(0), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonFailure), - JobListResponse(0), true); + JobListResponse(0), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonRetry), - JobListResponse(0), true); + JobListResponse(0), net::HTTP_OK); } void PrinterJobHandlerTest::MessageLoopQuitNowHelper( @@ -543,16 +544,16 @@ void PrinterJobHandlerTest::AddMimeHeader(const GURL& url, void PrinterJobHandlerTest::SetUpJobSuccessTest(int job_num) { factory_.SetFakeResponse(TicketURI(job_num), - kExamplePrintTicket, true); + kExamplePrintTicket, net::HTTP_OK); factory_.SetFakeResponse(DownloadURI(job_num), - kExamplePrintData, true); + kExamplePrintData, net::HTTP_OK); factory_.SetFakeResponse(DoneURI(job_num), StatusResponse(job_num, "DONE"), - true); + net::HTTP_OK); factory_.SetFakeResponse(InProgressURI(job_num), StatusResponse(job_num, "IN_PROGRESS"), - true); + net::HTTP_OK); // The times requirement is relaxed for the ticket URI // in order to accommodate TicketDownloadFailureTest @@ -656,9 +657,9 @@ MockPrintSystem::MockPrintSystem() // Disabled - http://crbug.com/184245 TEST_F(PrinterJobHandlerTest, DISABLED_HappyPathTest) { factory_.SetFakeResponse(JobListURI(kJobFetchReasonStartup), - JobListResponse(1), true); + JobListResponse(1), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonQueryMore), - JobListResponse(0), true); + JobListResponse(0), net::HTTP_OK); EXPECT_CALL(url_callback_, OnRequestCreate(JobListURI(kJobFetchReasonStartup), _)) @@ -673,12 +674,13 @@ TEST_F(PrinterJobHandlerTest, DISABLED_HappyPathTest) { TEST_F(PrinterJobHandlerTest, TicketDownloadFailureTest) { factory_.SetFakeResponse(JobListURI(kJobFetchReasonStartup), - JobListResponse(2), true); + JobListResponse(2), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonFailure), - JobListResponse(2), true); + JobListResponse(2), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonQueryMore), - JobListResponse(0), true); - factory_.SetFakeResponse(TicketURI(1), std::string(), false); + JobListResponse(0), net::HTTP_OK); + factory_.SetFakeResponse(TicketURI(1), std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); EXPECT_CALL(url_callback_, OnRequestCreate(TicketURI(1), _)) .Times(AtLeast(1)); @@ -703,13 +705,13 @@ TEST_F(PrinterJobHandlerTest, TicketDownloadFailureTest) { // re-enable it TEST_F(PrinterJobHandlerTest, DISABLED_ManyFailureTest) { factory_.SetFakeResponse(JobListURI(kJobFetchReasonStartup), - JobListResponse(1), true); + JobListResponse(1), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonFailure), - JobListResponse(1), true); + JobListResponse(1), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonRetry), - JobListResponse(1), true); + JobListResponse(1), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonQueryMore), - JobListResponse(0), true); + JobListResponse(0), net::HTTP_OK); EXPECT_CALL(url_callback_, OnRequestCreate(JobListURI(kJobFetchReasonStartup), _)) @@ -729,14 +731,16 @@ TEST_F(PrinterJobHandlerTest, DISABLED_ManyFailureTest) { SetUpJobSuccessTest(1); - factory_.SetFakeResponse(TicketURI(1), std::string(), false); + factory_.SetFakeResponse(TicketURI(1), + std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); loop_.PostDelayedTask(FROM_HERE, base::Bind(&net::FakeURLFetcherFactory::SetFakeResponse, base::Unretained(&factory_), TicketURI(1), kExamplePrintTicket, - true), + net::HTTP_OK), base::TimeDelta::FromSeconds(1)); @@ -748,13 +752,15 @@ TEST_F(PrinterJobHandlerTest, DISABLED_ManyFailureTest) { // constant values) seconds and re-enable it TEST_F(PrinterJobHandlerTest, DISABLED_CompleteFailureTest) { factory_.SetFakeResponse(JobListURI(kJobFetchReasonStartup), - JobListResponse(1), true); + JobListResponse(1), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonFailure), - JobListResponse(1), true); + JobListResponse(1), net::HTTP_OK); factory_.SetFakeResponse(JobListURI(kJobFetchReasonRetry), - JobListResponse(1), true); - factory_.SetFakeResponse(ErrorURI(1), StatusResponse(1, "ERROR"), true); - factory_.SetFakeResponse(TicketURI(1), std::string(), false); + JobListResponse(1), net::HTTP_OK); + factory_.SetFakeResponse(ErrorURI(1), StatusResponse(1, "ERROR"), + net::HTTP_OK); + factory_.SetFakeResponse(TicketURI(1), std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); EXPECT_CALL(url_callback_, OnRequestCreate(JobListURI(kJobFetchReasonStartup), _)) diff --git a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc index 58e58c2..8dddd2f 100644 --- a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc +++ b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc @@ -6,6 +6,7 @@ #include "base/bind_helpers.h" #include "base/message_loop/message_loop.h" #include "components/dom_distiller/core/distiller_url_fetcher.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_fetcher.h" #include "net/url_request/url_request_context_getter.h" @@ -31,10 +32,12 @@ public: factory_.reset(new net::FakeURLFetcherFactory(NULL)); factory_->SetFakeResponse( GURL(kTestPageA), - std::string(kTestPageAResponse, sizeof(kTestPageAResponse)), true); + std::string(kTestPageAResponse, sizeof(kTestPageAResponse)), + net::HTTP_OK); factory_->SetFakeResponse( GURL(kTestPageB), - std::string(kTestPageBResponse, sizeof(kTestPageBResponse)), false); + std::string(kTestPageBResponse, sizeof(kTestPageBResponse)), + net::HTTP_INTERNAL_SERVER_ERROR); } void Fetch(const std::string& url, diff --git a/components/precache/core/precache_fetcher_unittest.cc b/components/precache/core/precache_fetcher_unittest.cc index da2bdca..e2fe2ad 100644 --- a/components/precache/core/precache_fetcher_unittest.cc +++ b/components/precache/core/precache_fetcher_unittest.cc @@ -17,6 +17,7 @@ #include "components/precache/core/precache_switches.h" #include "components/precache/core/proto/precache.pb.h" #include "net/http/http_response_headers.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" #include "testing/gtest/include/gtest/gtest.h" @@ -29,11 +30,11 @@ class TestURLFetcherCallback { public: scoped_ptr<net::FakeURLFetcher> CreateURLFetcher( const GURL& url, net::URLFetcherDelegate* delegate, - const std::string& response_data, bool success) { + const std::string& response_data, net::HttpStatusCode response_code) { scoped_ptr<net::FakeURLFetcher> fetcher( - new net::FakeURLFetcher(url, delegate, response_data, success)); + new net::FakeURLFetcher(url, delegate, response_data, response_code)); - if (success) { + if (response_code == net::HTTP_OK) { scoped_refptr<net::HttpResponseHeaders> download_headers = new net::HttpResponseHeaders(""); download_headers->AddHeader("Content-Type: text/html"); @@ -123,13 +124,19 @@ TEST_F(PrecacheFetcherTest, FullPrecache) { good_manifest.add_resource(); // Resource with no URL, should not be fetched. good_manifest.add_resource()->set_url(kGoodResourceURL); - factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(), true); - factory_.SetFakeResponse(GURL(kManifestFetchFailureURL), "", false); - factory_.SetFakeResponse(GURL(kBadManifestURL), "bad protobuf", true); + factory_.SetFakeResponse(GURL(kConfigURL), + config.SerializeAsString(), + net::HTTP_OK); + factory_.SetFakeResponse(GURL(kManifestFetchFailureURL), + "", + net::HTTP_INTERNAL_SERVER_ERROR); + factory_.SetFakeResponse(GURL(kBadManifestURL), "bad protobuf", net::HTTP_OK); factory_.SetFakeResponse(GURL(kGoodManifestURL), - good_manifest.SerializeAsString(), true); - factory_.SetFakeResponse(GURL(kResourceFetchFailureURL), "", false); - factory_.SetFakeResponse(GURL(kGoodResourceURL), "good", true); + good_manifest.SerializeAsString(), net::HTTP_OK); + factory_.SetFakeResponse(GURL(kResourceFetchFailureURL), + "", + net::HTTP_INTERNAL_SERVER_ERROR); + factory_.SetFakeResponse(GURL(kGoodResourceURL), "good", net::HTTP_OK); PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(), &precache_delegate_); @@ -156,7 +163,9 @@ TEST_F(PrecacheFetcherTest, ConfigFetchFailure) { std::list<GURL> starting_urls(1, GURL("http://starting-url.com")); - factory_.SetFakeResponse(GURL(kConfigURL), "", false); + factory_.SetFakeResponse(GURL(kConfigURL), + "", + net::HTTP_INTERNAL_SERVER_ERROR); PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(), &precache_delegate_); @@ -177,7 +186,7 @@ TEST_F(PrecacheFetcherTest, BadConfig) { std::list<GURL> starting_urls(1, GURL("http://starting-url.com")); - factory_.SetFakeResponse(GURL(kConfigURL), "bad protobuf", true); + factory_.SetFakeResponse(GURL(kConfigURL), "bad protobuf", net::HTTP_OK); PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(), &precache_delegate_); @@ -202,7 +211,9 @@ TEST_F(PrecacheFetcherTest, Cancel) { config.add_whitelisted_starting_url("http://starting-url.com"); config.set_maximum_rank_starting_url(1); - factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(), true); + factory_.SetFakeResponse(GURL(kConfigURL), + config.SerializeAsString(), + net::HTTP_OK); scoped_ptr<PrecacheFetcher> precache_fetcher(new PrecacheFetcher( starting_urls, request_context_.get(), &precache_delegate_)); @@ -230,7 +241,7 @@ TEST_F(PrecacheFetcherTest, PrecacheUsingDefaultConfigSettingsURL) { factory_.SetFakeResponse(GURL(PRECACHE_CONFIG_SETTINGS_URL), PrecacheConfigurationSettings().SerializeAsString(), - true); + net::HTTP_OK); PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(), &precache_delegate_); @@ -264,9 +275,12 @@ TEST_F(PrecacheFetcherTest, PrecacheUsingDefaultManifestURLPrefix) { GURL manifest_url(PRECACHE_MANIFEST_URL_PREFIX "http%253A%252F%252Fstarting-url.com%252F"); - factory_.SetFakeResponse(GURL(kConfigURL), config.SerializeAsString(), true); - factory_.SetFakeResponse(manifest_url, PrecacheManifest().SerializeAsString(), - true); + factory_.SetFakeResponse(GURL(kConfigURL), + config.SerializeAsString(), + net::HTTP_OK); + factory_.SetFakeResponse(manifest_url, + PrecacheManifest().SerializeAsString(), + net::HTTP_OK); PrecacheFetcher precache_fetcher(starting_urls, request_context_.get(), &precache_delegate_); diff --git a/net/url_request/test_url_fetcher_factory.cc b/net/url_request/test_url_fetcher_factory.cc index e4a47d7..62fbb07 100644 --- a/net/url_request/test_url_fetcher_factory.cc +++ b/net/url_request/test_url_fetcher_factory.cc @@ -283,13 +283,15 @@ void TestURLFetcherFactory::SetDelegateForTests( FakeURLFetcher::FakeURLFetcher(const GURL& url, URLFetcherDelegate* d, const std::string& response_data, - bool success) + HttpStatusCode response_code) : TestURLFetcher(0, url, d), weak_factory_(this) { set_status(URLRequestStatus( - success ? URLRequestStatus::SUCCESS : URLRequestStatus::FAILED, + // Status is FAILED for HTTP/5xx server errors, and SUCCESS otherwise. + response_code >= HTTP_INTERNAL_SERVER_ERROR ? URLRequestStatus::FAILED : + URLRequestStatus::SUCCESS, 0)); - set_response_code(success ? 200 : 500); + set_response_code(response_code); SetResponseString(response_data); } @@ -327,10 +329,12 @@ FakeURLFetcherFactory::FakeURLFetcherFactory( scoped_ptr<FakeURLFetcher> FakeURLFetcherFactory::DefaultFakeURLFetcherCreator( const GURL& url, URLFetcherDelegate* delegate, - const std::string& response, - bool success) { - return scoped_ptr<FakeURLFetcher>(new FakeURLFetcher(url, delegate, - response, success)); + const std::string& response_data, + HttpStatusCode response_code) { + return scoped_ptr<FakeURLFetcher>(new FakeURLFetcher(url, + delegate, + response_data, + response_code)); } FakeURLFetcherFactory::~FakeURLFetcherFactory() {} @@ -360,9 +364,9 @@ URLFetcher* FakeURLFetcherFactory::CreateURLFetcher( void FakeURLFetcherFactory::SetFakeResponse( const GURL& url, const std::string& response_data, - bool success) { + HttpStatusCode response_code) { // Overwrite existing URL if it already exists. - fake_responses_[url] = std::make_pair(response_data, success); + fake_responses_[url] = std::make_pair(response_data, response_code); } void FakeURLFetcherFactory::ClearFakeResponses() { diff --git a/net/url_request/test_url_fetcher_factory.h b/net/url_request/test_url_fetcher_factory.h index eed02a4..50ab815 100644 --- a/net/url_request/test_url_fetcher_factory.h +++ b/net/url_request/test_url_fetcher_factory.h @@ -18,6 +18,7 @@ #include "base/memory/weak_ptr.h" #include "base/threading/non_thread_safe.h" #include "net/http/http_request_headers.h" +#include "net/http/http_status_code.h" #include "net/url_request/url_fetcher_factory.h" #include "net/url_request/url_request_status.h" #include "url/gurl.h" @@ -276,7 +277,7 @@ class TestURLFetcherFactory : public URLFetcherFactory, // Example usage: // FakeURLFetcher fake_fetcher("http://a.com", some_delegate, // "<html><body>hello world</body></html>", -// true); +// HTTP_OK); // // // Will schedule a call to some_delegate->OnURLFetchComplete(&fake_fetcher). // fake_fetcher.Start(); @@ -285,7 +286,8 @@ class FakeURLFetcher : public TestURLFetcher { // Normal URL fetcher constructor but also takes in a pre-baked response. FakeURLFetcher(const GURL& url, URLFetcherDelegate* d, - const std::string& response_data, bool success); + const std::string& response_data, + HttpStatusCode response_code); // Start the request. This will call the given delegate asynchronously // with the pre-baked response as parameter. @@ -312,7 +314,7 @@ class FakeURLFetcher : public TestURLFetcher { // // This class is not thread-safe. You should not call SetFakeResponse or // ClearFakeResponse at the same time you call CreateURLFetcher. However, it is -// OK to start URLFetcher objects while setting or clearning fake responses +// OK to start URLFetcher objects while setting or clearing fake responses // since already created URLFetcher objects will not be affected by any changes // made to the fake responses (once a URLFetcher object is created you cannot // change its fake response). @@ -320,32 +322,41 @@ class FakeURLFetcher : public TestURLFetcher { // Example usage: // FakeURLFetcherFactory factory; // -// // You know that class SomeService will request url http://a.com/ and you -// // want to test the service class by returning an error. -// factory.SetFakeResponse("http://a.com/", "", false); -// // But if the service requests http://b.com/asdf you want to respond with -// // a simple html page and an HTTP/200 code. -// factory.SetFakeResponse("http://b.com/asdf", +// // You know that class SomeService will request http://a.com/success and you +// // want to respond with a simple html page and an HTTP/200 code. +// factory.SetFakeResponse("http://a.com/success", // "<html><body>hello world</body></html>", -// true); +// HTTP_OK); +// // You know that class SomeService will request url http://a.com/failure and +// // you want to test the service class by returning a server error. +// factory.SetFakeResponse("http://a.com/failure", +// "", +// HTTP_INTERNAL_SERVER_ERROR); +// // You know that class SomeService will request url http://a.com/error and +// // you want to test the service class by returning a specific error code, +// // say, a HTTP/401 error. +// factory.SetFakeResponse("http://a.com/error", +// "some_response", +// HTTP_UNAUTHORIZED); // // SomeService service; -// service.Run(); // Will eventually request these two URLs. +// service.Run(); // Will eventually request these three URLs. class FakeURLFetcherFactory : public URLFetcherFactory, public ScopedURLFetcherFactory { public: - // Parameters to FakeURLFetcherCreator: url, delegate, response_data, success + // Parameters to FakeURLFetcherCreator: url, delegate, response_data, + // response_code // |url| URL for instantiated FakeURLFetcher // |delegate| Delegate for FakeURLFetcher // |response_data| response data for FakeURLFetcher - // |success| bool indicating response code. true = 200 and false = 500. - // These argument should by default be used in instantiating FakeURLFetcher - // as follows: new FakeURLFetcher(url, delegate, response_data, success) + // |response_code| response code for FakeURLFetcher + // These arguments should by default be used in instantiating FakeURLFetcher + // as follows: new FakeURLFetcher(url, delegate, response_data, response_code) typedef base::Callback<scoped_ptr<FakeURLFetcher>( const GURL&, URLFetcherDelegate*, const std::string&, - bool)> FakeURLFetcherCreator; + HttpStatusCode)> FakeURLFetcherCreator; // |default_factory|, which can be NULL, is a URLFetcherFactory that // will be used to construct a URLFetcher in case the URL being created @@ -376,11 +387,14 @@ class FakeURLFetcherFactory : public URLFetcherFactory, URLFetcher::RequestType request_type, URLFetcherDelegate* d) OVERRIDE; - // Sets the fake response for a given URL. If success is true we will serve - // an HTTP/200 and an HTTP/500 otherwise. The |response_data| may be empty. + // Sets the fake response for a given URL. The |response_data| may be empty. + // The |response_code| may be any HttpStatusCode. For instance, HTTP_OK will + // return an HTTP/200 and HTTP_INTERNAL_SERVER_ERROR will return an HTTP/500. + // Note: The URLRequestStatus of FakeURLFetchers created by the factory will + // be FAILED for HttpStatusCodes HTTP/5xx, and SUCCESS for all other codes. void SetFakeResponse(const GURL& url, const std::string& response_data, - bool success); + HttpStatusCode response_code); // Clear all the fake responses that were previously set via // SetFakeResponse(). @@ -388,15 +402,16 @@ class FakeURLFetcherFactory : public URLFetcherFactory, private: const FakeURLFetcherCreator creator_; - typedef std::map<GURL, std::pair<std::string, bool> > FakeResponseMap; + typedef std::map<GURL, + std::pair<std::string, HttpStatusCode> > FakeResponseMap; FakeResponseMap fake_responses_; URLFetcherFactory* const default_factory_; static scoped_ptr<FakeURLFetcher> DefaultFakeURLFetcherCreator( const GURL& url, URLFetcherDelegate* delegate, - const std::string& response, - bool success); + const std::string& response_data, + HttpStatusCode response_code); DISALLOW_COPY_AND_ASSIGN(FakeURLFetcherFactory); }; diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc index fa30d8f..1eb14f7 100644 --- a/remoting/host/token_validator_factory_impl_unittest.cc +++ b/remoting/host/token_validator_factory_impl_unittest.cc @@ -8,6 +8,7 @@ #include "base/json/json_writer.h" #include "base/values.h" +#include "net/http/http_status_code.h" #include "net/url_request/test_url_fetcher_factory.h" #include "net/url_request/url_request_test_util.h" #include "remoting/base/rsa_key_pair.h" @@ -94,7 +95,7 @@ TEST_F(TokenValidatorFactoryImplTest, Success) { token_validator_ = token_validator_factory_->CreateTokenValidator( kLocalJid, kRemoteJid); factory.SetFakeResponse(GURL(kTokenValidationUrl), CreateResponse( - token_validator_->token_scope()), true); + token_validator_->token_scope()), net::HTTP_OK); token_validator_->ValidateThirdPartyToken( kToken, base::Bind(&TokenValidatorFactoryImplTest::SuccessCallback, base::Unretained(this))); @@ -105,7 +106,9 @@ TEST_F(TokenValidatorFactoryImplTest, BadToken) { net::FakeURLFetcherFactory factory(NULL); token_validator_ = token_validator_factory_->CreateTokenValidator( kLocalJid, kRemoteJid); - factory.SetFakeResponse(GURL(kTokenValidationUrl), std::string(), false); + factory.SetFakeResponse(GURL(kTokenValidationUrl), + std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); token_validator_->ValidateThirdPartyToken( kToken, base::Bind(&TokenValidatorFactoryImplTest::FailureCallback, base::Unretained(this))); @@ -117,7 +120,7 @@ TEST_F(TokenValidatorFactoryImplTest, BadScope) { token_validator_ = token_validator_factory_->CreateTokenValidator( kLocalJid, kRemoteJid); factory.SetFakeResponse( - GURL(kTokenValidationUrl), CreateResponse(kBadScope), true); + GURL(kTokenValidationUrl), CreateResponse(kBadScope), net::HTTP_OK); token_validator_->ValidateThirdPartyToken( kToken, base::Bind(&TokenValidatorFactoryImplTest::FailureCallback, base::Unretained(this))); @@ -128,7 +131,9 @@ TEST_F(TokenValidatorFactoryImplTest, DeleteOnFailure) { net::FakeURLFetcherFactory factory(NULL); token_validator_ = token_validator_factory_->CreateTokenValidator( kLocalJid, kRemoteJid); - factory.SetFakeResponse(GURL(kTokenValidationUrl), std::string(), false); + factory.SetFakeResponse(GURL(kTokenValidationUrl), + std::string(), + net::HTTP_INTERNAL_SERVER_ERROR); token_validator_->ValidateThirdPartyToken( kToken, base::Bind( &TokenValidatorFactoryImplTest::DeleteOnFailureCallback, |