| Index: extensions/browser/extension_protocols.cc
|
| diff --git a/extensions/browser/extension_protocols.cc b/extensions/browser/extension_protocols.cc
|
| index 2dbbf31b9dd63aa193fa98dc693a70a52d225b8c..c97f172607acbc2650537d6895a60a5704da4208 100644
|
| --- a/extensions/browser/extension_protocols.cc
|
| +++ b/extensions/browser/extension_protocols.cc
|
| @@ -18,6 +18,7 @@
|
| #include "base/format_macros.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/metrics/field_trial.h"
|
| @@ -282,7 +283,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob {
|
|
|
| scoped_refptr<ContentVerifyJob> verify_job_;
|
|
|
| - scoped_ptr<base::ElapsedTimer> request_timer_;
|
| + std::unique_ptr<base::ElapsedTimer> request_timer_;
|
|
|
| // The position we seeked to in the file.
|
| int64_t seek_position_;
|
| @@ -575,10 +576,10 @@ net::HttpResponseHeaders* BuildHttpHeaders(
|
| return new net::HttpResponseHeaders(raw_headers);
|
| }
|
|
|
| -scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| +std::unique_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| CreateExtensionProtocolHandler(bool is_incognito,
|
| extensions::InfoMap* extension_info_map) {
|
| - return make_scoped_ptr(
|
| + return base::WrapUnique(
|
| new ExtensionProtocolHandler(is_incognito, extension_info_map));
|
| }
|
|
|
|
|