| Index: content/common/resource_dispatcher_unittest.cc
|
| diff --git a/content/common/resource_dispatcher_unittest.cc b/content/common/resource_dispatcher_unittest.cc
|
| index 56561febf374814ca3e45770891d3a31b4f4a5d3..13439351e05e1aea9e05fbb3a131b631641c0ecc 100644
|
| --- a/content/common/resource_dispatcher_unittest.cc
|
| +++ b/content/common/resource_dispatcher_unittest.cc
|
| @@ -45,13 +45,17 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
|
| virtual bool OnReceivedRedirect(
|
| const GURL& new_url,
|
| const ResourceResponseInfo& info,
|
| + const base::TimeTicks& start_time,
|
| + const base::TimeTicks& end_time,
|
| bool* has_new_first_party_for_cookies,
|
| GURL* new_first_party_for_cookies) {
|
| *has_new_first_party_for_cookies = false;
|
| return true;
|
| }
|
|
|
| - virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
|
| + virtual void OnReceivedResponse(const ResourceResponseInfo& info,
|
| + const base::TimeTicks& start_time,
|
| + const base::TimeTicks& end_time) {
|
| }
|
|
|
| virtual void OnDownloadedData(int len) {
|
| @@ -67,7 +71,7 @@ class TestRequestCallback : public ResourceLoaderBridge::Peer {
|
|
|
| virtual void OnCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| - const base::Time& completion_time) {
|
| + const base::TimeTicks& completion_time) {
|
| EXPECT_FALSE(complete_);
|
| complete_ = true;
|
| }
|
| @@ -120,7 +124,8 @@ class ResourceDispatcherTest : public testing::Test,
|
| response.headers = new net::HttpResponseHeaders(raw_headers);
|
| response.mime_type = test_page_mime_type;
|
| response.charset = test_page_charset;
|
| - dispatcher_->OnReceivedResponse(request_id, response);
|
| + dispatcher_->OnReceivedResponse(request_id, response, base::TimeTicks(),
|
| + base::TimeTicks());
|
|
|
| // received data message with the test contents
|
| base::SharedMemory shared_mem;
|
| @@ -245,7 +250,8 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
|
| response_head.status.set_status(net::URLRequestStatus::SUCCESS);
|
|
|
| IPC::Message* response_message =
|
| - new ResourceMsg_ReceivedResponse(0, 0, response_head);
|
| + new ResourceMsg_ReceivedResponse(0, 0, response_head,
|
| + base::TimeTicks(), base::TimeTicks());
|
|
|
| dispatcher_->OnMessageReceived(*response_message);
|
|
|
| @@ -274,13 +280,17 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
|
| virtual bool OnReceivedRedirect(
|
| const GURL& new_url,
|
| const ResourceResponseInfo& info,
|
| + const base::TimeTicks& start_time,
|
| + const base::TimeTicks& end_time,
|
| bool* has_new_first_party_for_cookies,
|
| GURL* new_first_party_for_cookies) {
|
| *has_new_first_party_for_cookies = false;
|
| return true;
|
| }
|
|
|
| - virtual void OnReceivedResponse(const ResourceResponseInfo& info) {
|
| + virtual void OnReceivedResponse(const ResourceResponseInfo& info,
|
| + const base::TimeTicks& start_time,
|
| + const base::TimeTicks& end_time) {
|
| EXPECT_EQ(defer_loading_, false);
|
| set_defer_loading(true);
|
| }
|
| @@ -297,7 +307,7 @@ class DeferredResourceLoadingTest : public ResourceDispatcherTest,
|
|
|
| virtual void OnCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| - const base::Time& completion_time) {
|
| + const base::TimeTicks& completion_time) {
|
| }
|
|
|
| protected:
|
|
|