| Index: chrome/browser/safe_browsing/client_side_model_loader.h
|
| diff --git a/chrome/browser/safe_browsing/client_side_model_loader.h b/chrome/browser/safe_browsing/client_side_model_loader.h
|
| index aa8f1b7c21bd454d57ff7b4be32516dcd8d90852..ea68e6345a8e715b1120e0750ff2b1972608a73f 100644
|
| --- a/chrome/browser/safe_browsing/client_side_model_loader.h
|
| +++ b/chrome/browser/safe_browsing/client_side_model_loader.h
|
| @@ -14,6 +14,7 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| @@ -21,7 +22,6 @@
|
| #include "base/macros.h"
|
| #include "base/memory/linked_ptr.h"
|
| #include "base/memory/ref_counted.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "net/url_request/url_fetcher_delegate.h"
|
| @@ -114,8 +114,8 @@ class ModelLoader : public net::URLFetcherDelegate {
|
|
|
| // If the model isn't yet loaded, model_str_ will be empty.
|
| std::string model_str_;
|
| - scoped_ptr<ClientSideModel> model_;
|
| - scoped_ptr<net::URLFetcher> fetcher_;
|
| + std::unique_ptr<ClientSideModel> model_;
|
| + std::unique_ptr<net::URLFetcher> fetcher_;
|
|
|
| // Callback to invoke when we've got a new model. CSD will send it around.
|
| base::Closure update_renderers_callback_;
|
|
|