diff options
| author | thakis <thakis@chromium.org> | 2015-06-18 21:53:04 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-19 04:54:30 +0000 |
| commit | 01fd50b1484c52d89f4cee8c16f42ab1f6afa960 (patch) | |
| tree | 5ec352d64adb8f883acfb725f8249144f430f5d0 /android_webview | |
| parent | e8d28bafe7b5aff68cbb1d6b4fa8745bc3ea430c (diff) | |
| download | chromium_src-01fd50b1484c52d89f4cee8c16f42ab1f6afa960.zip chromium_src-01fd50b1484c52d89f4cee8c16f42ab1f6afa960.tar.gz chromium_src-01fd50b1484c52d89f4cee8c16f42ab1f6afa960.tar.bz2 | |
Revert of Use scoped_ptr for NavigationEntries. (patchset #4 id:60001 of https://codereview.chromium.org/1191893009/)
Reason for revert:
Breaks Mac official
Original issue's description:
> Use scoped_ptr for NavigationEntries.
>
> BUG=none
> TEST=none
>
> Committed: https://crrev.com/2fc587ca7953483ebd9e8d71636d2a1b28a59c06
> Cr-Commit-Position: refs/heads/master@{#335167}
TBR=mnaganov@chromium.org,creis@chromium.org,avi@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none
Review URL: https://codereview.chromium.org/1195723002
Cr-Commit-Position: refs/heads/master@{#335211}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/state_serializer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/native/state_serializer.cc b/android_webview/native/state_serializer.cc index 36589a1..50dfd34 100644 --- a/android_webview/native/state_serializer.cc +++ b/android_webview/native/state_serializer.cc @@ -110,7 +110,7 @@ bool RestoreFromPickle(base::PickleIterator* iterator, controller.Restore( selected_entry, content::NavigationController::RESTORE_LAST_SESSION_EXITED_CLEANLY, - &restored_entries); + &restored_entries.get()); DCHECK_EQ(0u, restored_entries.size()); if (controller.GetActiveEntry()) { |