| Index: content/shell/browser/shell_net_log.h
|
| diff --git a/content/shell/browser/shell_net_log.h b/content/shell/browser/shell_net_log.h
|
| index b61edf258c0009a79236c76c98fb2c48c9525e80..3f4cf87734527484c2321494ad6f867dbea4cd6f 100644
|
| --- a/content/shell/browser/shell_net_log.h
|
| +++ b/content/shell/browser/shell_net_log.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_
|
| #define CONTENT_SHELL_BROWSER_SHELL_NET_LOG_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/log/write_to_file_net_log_observer.h"
|
|
|
| namespace content {
|
| @@ -19,7 +19,7 @@ class ShellNetLog : public net::NetLog {
|
| ~ShellNetLog() override;
|
|
|
| private:
|
| - scoped_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_;
|
| + std::unique_ptr<net::WriteToFileNetLogObserver> write_to_file_observer_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ShellNetLog);
|
| };
|
|
|