Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc |
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 87d26e066dab4cc4a4d7e887db9a0878efec0a21..76f25fe1be5fefde84284c4261c84bf0303e0a75 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 |
@@ -22,6 +22,7 @@ |
#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_status.h" |
#include "net/url_request/url_request_test_util.h" |
using testing::InvokeWithoutArgs; |
@@ -294,10 +295,11 @@ class MockableFakeURLFetcherCreator { |
const GURL& url, |
net::URLFetcherDelegate* delegate, |
const std::string& response_data, |
- net::HttpStatusCode response_code) { |
+ net::HttpStatusCode response_code, |
+ net::URLRequestStatus::Status status) { |
OnCreateFakeURLFetcher(url.spec()); |
- return scoped_ptr<net::FakeURLFetcher>( |
- new net::FakeURLFetcher(url, delegate, response_data, response_code)); |
+ return scoped_ptr<net::FakeURLFetcher>(new net::FakeURLFetcher( |
+ url, delegate, response_data, response_code, status)); |
} |
net::FakeURLFetcherFactory::FakeURLFetcherCreator callback() { |
@@ -337,32 +339,38 @@ class LocalDiscoveryUITest : public WebUIBrowserTest { |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLInfo), |
kResponseInfo, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLRegisterStart), |
kResponseRegisterStart, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLRegisterClaimToken), |
kResponseRegisterClaimTokenNoConfirm, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLCloudPrintConfirm), |
kResponseCloudPrintConfirm, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLRegisterComplete), |
kResponseRegisterComplete, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLGaiaToken), |
kResponseGaiaToken, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
EXPECT_CALL(fake_url_fetcher_creator(), OnCreateFakeURLFetcher( |
kURLGaiaToken)) |
@@ -482,12 +490,14 @@ IN_PROC_BROWSER_TEST_F(LocalDiscoveryUITest, RegisterTest) { |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLRegisterClaimToken), |
kResponseRegisterClaimTokenConfirm, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
fake_fetcher_factory().SetFakeResponse( |
GURL(kURLInfo), |
kResponseInfoWithID, |
- net::HTTP_OK); |
+ net::HTTP_OK, |
+ net::URLRequestStatus::SUCCESS); |
{ |
InSequence s; |