| Index: content/public/renderer/document_state.h
|
| diff --git a/content/public/renderer/document_state.h b/content/public/renderer/document_state.h
|
| index 99beb47147e6bfc08ffa05c0d9cc71d5c9694b66..bc772691f34f1be02aeb7d8b968d801be8c6e0cd 100644
|
| --- a/content/public/renderer/document_state.h
|
| +++ b/content/public/renderer/document_state.h
|
| @@ -5,10 +5,10 @@
|
| #ifndef CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
|
| #define CONTENT_PUBLIC_RENDERER_DOCUMENT_STATE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/supports_user_data.h"
|
| #include "base/time/time.h"
|
| #include "content/common/content_export.h"
|
| @@ -239,7 +239,7 @@ class CONTENT_EXPORT DocumentState
|
|
|
| LoadType load_type_;
|
|
|
| - scoped_ptr<NavigationState> navigation_state_;
|
| + std::unique_ptr<NavigationState> navigation_state_;
|
|
|
| bool can_load_local_resources_;
|
| };
|
|
|