Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1041)

Unified Diff: content/renderer/history_serialization.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/history_serialization.h ('k') | content/renderer/in_process_renderer_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « content/renderer/history_serialization.h ('k') | content/renderer/in_process_renderer_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698