diff options
| author | creis <creis@chromium.org> | 2015-02-12 15:29:50 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-02-12 23:30:36 +0000 |
| commit | 7b2d3d199ebcd0109d0ba4fd71d201510408c789 (patch) | |
| tree | 46f8e09b3c9f6fe79308e5adf59cc82926358e90 /content/test/test_web_contents.h | |
| parent | 75c2b017bd1ab668d7f20fde6af6f5506a842c02 (diff) | |
| download | chromium_src-7b2d3d199ebcd0109d0ba4fd71d201510408c789.zip chromium_src-7b2d3d199ebcd0109d0ba4fd71d201510408c789.tar.gz chromium_src-7b2d3d199ebcd0109d0ba4fd71d201510408c789.tar.bz2 | |
Call ComputeWebKitPrefs on the correct RVH, and remove dead code.
RenderViewHost was calling out to WebContents to get the URL, but it
was getting the wrong URL (e.g., possibly the transient one) and then
never looking at it. Worse, WebContents then called ComputeWebkitPrefs
on the wrong RVH (the old one, not the pending one).
This only seems to come up in corner cases, like chrome://history on
Android when Javascript is disabled.
BUG=454063
TEST=See bug.
TBR=jam
Review URL: https://codereview.chromium.org/919933002
Cr-Commit-Position: refs/heads/master@{#316081}
Diffstat (limited to 'content/test/test_web_contents.h')
| -rw-r--r-- | content/test/test_web_contents.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h index 92f8db3..4d9b3ab 100644 --- a/content/test/test_web_contents.h +++ b/content/test/test_web_contents.h @@ -6,7 +6,6 @@ #define CONTENT_TEST_TEST_WEB_CONTENTS_H_ #include "content/browser/web_contents/web_contents_impl.h" -#include "content/public/common/web_preferences.h" #include "content/public/test/web_contents_tester.h" #include "content/test/test_render_frame_host.h" #include "content/test/test_render_view_host.h" @@ -48,7 +47,6 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester { const GURL& url, const Referrer& referrer, ui::PageTransition transition) override; - WebPreferences TestComputeWebkitPrefs() override; // State accessor. bool cross_navigation_pending() { |