Index: content/renderer/history_entry.h |
diff --git a/content/renderer/history_entry.h b/content/renderer/history_entry.h |
index 4209d728f81f7928f476ef7edc77389b20974a5f..22c988af69ecc941c157c54a62835f97a5ee73bd 100644 |
--- a/content/renderer/history_entry.h |
+++ b/content/renderer/history_entry.h |
@@ -35,8 +35,9 @@ |
#ifndef CONTENT_RENDERER_HISTORY_ENTRY_H_ |
#define CONTENT_RENDERER_HISTORY_ENTRY_H_ |
+#include <memory> |
+ |
#include "base/containers/hash_tables.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/memory/weak_ptr.h" |
#include "content/common/content_export.h" |
@@ -77,7 +78,7 @@ class CONTENT_EXPORT HistoryEntry { |
// a dying HistoryEntry, or do unnecessary work when the whole entry is |
// being destroyed. |
base::WeakPtr<HistoryEntry> entry_; |
- scoped_ptr<ScopedVector<HistoryNode> > children_; |
+ std::unique_ptr<ScopedVector<HistoryNode>> children_; |
blink::WebHistoryItem item_; |
// We need to track multiple names because the name of a frame can change |
// over its lifetime. This allows us to clean up all of the names this node |
@@ -100,7 +101,7 @@ class CONTENT_EXPORT HistoryEntry { |
HistoryNode* root_history_node() const { return root_.get(); } |
private: |
- scoped_ptr<HistoryNode> root_; |
+ std::unique_ptr<HistoryNode> root_; |
typedef base::hash_map<std::string, HistoryNode*> UniqueNamesToItems; |
UniqueNamesToItems unique_names_to_items_; |