| Index: net/tools/flip_server/mem_cache.h
|
| diff --git a/net/tools/flip_server/mem_cache.h b/net/tools/flip_server/mem_cache.h
|
| index 6b85149eca0e804e6447f72f6a3a730e152c35f2..f073cb6aa076153c0f8369a9dae5bf1590dda58d 100644
|
| --- a/net/tools/flip_server/mem_cache.h
|
| +++ b/net/tools/flip_server/mem_cache.h
|
| @@ -9,11 +9,11 @@
|
| #include <stdint.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "net/tools/balsa/balsa_headers.h"
|
| #include "net/tools/balsa/balsa_visitor_interface.h"
|
| #include "net/tools/flip_server/constants.h"
|
| @@ -78,7 +78,7 @@ class FileData {
|
| const std::string& body() { return body_; }
|
|
|
| private:
|
| - scoped_ptr<BalsaHeaders> headers_;
|
| + std::unique_ptr<BalsaHeaders> headers_;
|
| std::string filename_;
|
| std::string body_;
|
|
|
| @@ -114,7 +114,7 @@ class MemCacheIter {
|
|
|
| class MemoryCache {
|
| public:
|
| - using Files = std::map<std::string, scoped_ptr<FileData>>;
|
| + using Files = std::map<std::string, std::unique_ptr<FileData>>;
|
|
|
| public:
|
| MemoryCache();
|
|
|