| 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 9138fdd92be0029bfef57f601c4b8715a213833b..2a002e0e60bf2433187dc89c8cafe2a5c168f075 100644
|
| --- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| +++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
|
| @@ -270,7 +270,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
|
| @@ -401,7 +401,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(
|
| @@ -486,7 +486,7 @@ class RequestProxy : public net::URLRequest::Delegate,
|
| upload_progress_timer_.Stop();
|
| }
|
| DCHECK(request_.get());
|
| - OnCompletedRequest(request_->status(), std::string(), base::Time());
|
| + OnCompletedRequest(request_->status(), std::string(), base::TimeTicks());
|
| request_.reset(); // destroy on the io thread
|
| }
|
|
|
| @@ -614,7 +614,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;
|
|
|