diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 18:19:59 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-05 18:19:59 +0000 |
| commit | 97e780da17ba0e8933e690e33751e19c5fe1bbb9 (patch) | |
| tree | 000fd0f30e238c1f523a92e7094ad1bbc0cd7bb5 /content/browser/webui | |
| parent | 7ffdf6ebd685eee46e65dbdc03862b79fa0522f5 (diff) | |
| download | chromium_src-97e780da17ba0e8933e690e33751e19c5fe1bbb9.zip chromium_src-97e780da17ba0e8933e690e33751e19c5fe1bbb9.tar.gz chromium_src-97e780da17ba0e8933e690e33751e19c5fe1bbb9.tar.bz2 | |
Make contents settable in RVHTH.
Add ability to swap out the TestTabContents in RenderViewHostTestHarness/TabContentsWrapperTestHarness.
BUG=71097
TEST=no visible change
Review URL: http://codereview.chromium.org/6720050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui')
| -rw-r--r-- | content/browser/webui/web_ui_unittest.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/content/browser/webui/web_ui_unittest.cc b/content/browser/webui/web_ui_unittest.cc index bbb7ab1..b81f3a8 100644 --- a/content/browser/webui/web_ui_unittest.cc +++ b/content/browser/webui/web_ui_unittest.cc @@ -166,8 +166,7 @@ TEST_F(WebUITest, FocusOnNavigate) { contents()->profile(), SiteInstance::CreateSiteInstance(contents()->profile())); tc->controller().CopyStateFrom(controller()); - scoped_ptr<TestTabContents> tc_scoped_ptr(tc); - contents_.swap(tc_scoped_ptr); + SetContents(tc); int page_id = 200; // Load the NTP. @@ -194,6 +193,4 @@ TEST_F(WebUITest, FocusOnNavigate) { controller().GoForward(); pending_rvh()->SendNavigate(next_page_id, next_url); EXPECT_EQ(focus_called, tc->focus_called()); - - contents_.swap(tc_scoped_ptr); } |