Fix history for reader mode
commit06c20e773985a26bcadf35623671514e01f2234a
authormdjones <mdjones@chromium.org>
Wed, 10 Jun 2015 15:48:15 +0000 (10 08:48 -0700)
committerCommit bot <commit-bot@chromium.org>
Wed, 10 Jun 2015 15:48:40 +0000 (10 15:48 +0000)
treeb0410a2057abeee3af15b0bf65b080d15a9fb633
parenta2caf9a3a0cb9d0f79c028af3aa7122e90912a7d
Fix history for reader mode

When entering reader mode, it was possible to get into a state where
the distilled page would have a pending history entry and would not
have the rest of the history merged. This change moves the history
merge to before a new entry is set in the distilled web contents.

BUG=498576

Review URL: https://codereview.chromium.org/1171343002

Cr-Commit-Position: refs/heads/master@{#333739}
chrome/android/java_staging/src/org/chromium/chrome/browser/dom_distiller/ReaderModePanel.java