| Index: chrome/browser/safe_browsing/safe_browsing_util.h
|
| diff --git a/chrome/browser/safe_browsing/safe_browsing_util.h b/chrome/browser/safe_browsing/safe_browsing_util.h
|
| index ae488bc366ca33af31d21895c283216b4c7040f2..03a79af8df72b7d343c4d352888b5b825e37a90c 100644
|
| --- a/chrome/browser/safe_browsing/safe_browsing_util.h
|
| +++ b/chrome/browser/safe_browsing/safe_browsing_util.h
|
| @@ -10,11 +10,11 @@
|
| #include <stddef.h>
|
|
|
| #include <cstring>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_piece.h"
|
| #include "base/time/time.h"
|
| #include "chrome/browser/safe_browsing/chunk_range.h"
|
| @@ -39,7 +39,7 @@ class SBChunkData {
|
| // Create with manufactured data, for testing only.
|
| // TODO(shess): Right now the test code calling this is in an anonymous
|
| // namespace. Figure out how to shift this into private:.
|
| - explicit SBChunkData(scoped_ptr<ChunkData> data);
|
| + explicit SBChunkData(std::unique_ptr<ChunkData> data);
|
|
|
| // Read serialized ChunkData, returning true if the parse suceeded.
|
| bool ParseFrom(const unsigned char* data, size_t length);
|
| @@ -60,7 +60,7 @@ class SBChunkData {
|
|
|
| private:
|
| // Protocol buffer sent from server.
|
| - scoped_ptr<ChunkData> chunk_data_;
|
| + std::unique_ptr<ChunkData> chunk_data_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SBChunkData);
|
| };
|
|
|