| Index: webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| index 73fd0cb883ffc9734cc2e05cd8f04be09e1ea2cf..841027b1357ba97c39ad2e34c93956e6945f60c4 100644
|
| --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| @@ -235,6 +235,7 @@ class RequestProxy : public net::URLRequest::Delegate,
|
| bool has_new_first_party_for_cookies = false;
|
| GURL new_first_party_for_cookies;
|
| if (peer_ && peer_->OnReceivedRedirect(new_url, info,
|
| + base::TimeTicks(), base::TimeTicks(),
|
| &has_new_first_party_for_cookies,
|
| &new_first_party_for_cookies)) {
|
| g_io_thread->message_loop()->PostTask(FROM_HERE, NewRunnableMethod(
|
| @@ -247,7 +248,7 @@ class RequestProxy : public net::URLRequest::Delegate,
|
|
|
| void NotifyReceivedResponse(const ResourceResponseInfo& info) {
|
| if (peer_)
|
| - peer_->OnReceivedResponse(info);
|
| + peer_->OnReceivedResponse(info, base::TimeTicks(), base::TimeTicks());
|
| }
|
|
|
| void NotifyReceivedData(int bytes_read) {
|
| @@ -284,7 +285,7 @@ class RequestProxy : public net::URLRequest::Delegate,
|
|
|
| void NotifyCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| - const base::Time& complete_time) {
|
| + const base::TimeTicks& complete_time) {
|
| if (peer_) {
|
| peer_->OnCompletedRequest(status, security_info, complete_time);
|
| DropPeer(); // ensure no further notifications
|
| @@ -415,7 +416,7 @@ class RequestProxy : public net::URLRequest::Delegate,
|
|
|
| virtual void OnCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| - const base::Time& complete_time) {
|
| + const base::TimeTicks& complete_time) {
|
| if (download_to_file_)
|
| file_stream_.Close();
|
| owner_loop_->PostTask(FROM_HERE, NewRunnableMethod(
|
| @@ -513,7 +514,7 @@ class RequestProxy : public net::URLRequest::Delegate,
|
| // |failed_file_request_status_|. Otherwise use request_'s status.
|
| OnCompletedRequest(failed_file_request_status_.get() ?
|
| *failed_file_request_status_ : request_->status(),
|
| - std::string(), base::Time());
|
| + std::string(), base::TimeTicks());
|
| request_.reset(); // destroy on the io thread
|
| }
|
|
|
| @@ -724,7 +725,7 @@ class SyncRequestProxy : public RequestProxy {
|
|
|
| virtual void OnCompletedRequest(const net::URLRequestStatus& status,
|
| const std::string& security_info,
|
| - const base::Time& complete_time) {
|
| + const base::TimeTicks& complete_time) {
|
| if (download_to_file_)
|
| file_stream_.Close();
|
| result_->status = status;
|
|
|