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

Unified Diff: content/browser/webui/web_ui_unittest.cc

Issue 6720050: Make contents settable in RVHTH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 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/browser/renderer_host/test_render_view_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/webui/web_ui_unittest.cc
diff --git a/content/browser/webui/web_ui_unittest.cc b/content/browser/webui/web_ui_unittest.cc
index bbb7ab1cd89febcb42fd284248b3e0483f4f5df1..b81f3a811335d0df59443533ab2428fade23946a 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);
}
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698