| Index: content/renderer/history_serialization.cc
|
| diff --git a/content/renderer/history_serialization.cc b/content/renderer/history_serialization.cc
|
| index f227ed380069f805660449917e8d017efb3310c6..0a4376c023cab71534f3f22fcde3ef5e989a27c2 100644
|
| --- a/content/renderer/history_serialization.cc
|
| +++ b/content/renderer/history_serialization.cc
|
| @@ -198,12 +198,13 @@ PageState SingleHistoryItemToPageState(const WebHistoryItem& item) {
|
| return PageState::CreateFromEncodedData(encoded_data);
|
| }
|
|
|
| -scoped_ptr<HistoryEntry> PageStateToHistoryEntry(const PageState& page_state) {
|
| +std::unique_ptr<HistoryEntry> PageStateToHistoryEntry(
|
| + const PageState& page_state) {
|
| ExplodedPageState state;
|
| if (!DecodePageState(page_state.ToEncodedData(), &state))
|
| - return scoped_ptr<HistoryEntry>();
|
| + return std::unique_ptr<HistoryEntry>();
|
|
|
| - scoped_ptr<HistoryEntry> entry(new HistoryEntry());
|
| + std::unique_ptr<HistoryEntry> entry(new HistoryEntry());
|
| RecursivelyGenerateHistoryItem(state.top, entry->root_history_node());
|
|
|
| return entry;
|
|
|