| Index: chrome/browser/safe_browsing/download_protection_service.cc
|
| diff --git a/chrome/browser/safe_browsing/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection_service.cc
|
| index 6a1ff000b0780116fb814d82e27fe5af32e3ab56..9f5afd498c39af0042aab0ec792b3413bf3c9650 100644
|
| --- a/chrome/browser/safe_browsing/download_protection_service.cc
|
| +++ b/chrome/browser/safe_browsing/download_protection_service.cc
|
| @@ -6,12 +6,13 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/command_line.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/format_macros.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/metrics/field_trial.h"
|
| #include "base/metrics/histogram.h"
|
| @@ -1033,7 +1034,7 @@ class DownloadProtectionService::CheckClientDownloadRequest
|
| ArchiveValid archive_is_valid_;
|
|
|
| ClientDownloadRequest_SignatureInfo signature_info_;
|
| - scoped_ptr<ClientDownloadRequest_ImageHeaders> image_headers_;
|
| + std::unique_ptr<ClientDownloadRequest_ImageHeaders> image_headers_;
|
| google::protobuf::RepeatedPtrField<ClientDownloadRequest_ArchivedBinary>
|
| archived_binary_;
|
| CheckDownloadCallback callback_;
|
| @@ -1042,7 +1043,7 @@ class DownloadProtectionService::CheckClientDownloadRequest
|
| scoped_refptr<BinaryFeatureExtractor> binary_feature_extractor_;
|
| scoped_refptr<SafeBrowsingDatabaseManager> database_manager_;
|
| const bool pingback_enabled_;
|
| - scoped_ptr<net::URLFetcher> fetcher_;
|
| + std::unique_ptr<net::URLFetcher> fetcher_;
|
| scoped_refptr<SandboxedZipAnalyzer> analyzer_;
|
| base::TimeTicks zip_analysis_start_time_;
|
| #if defined(OS_MACOSX)
|
|
|