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

Unified Diff: content/browser/renderer_host/test_render_view_host.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.h ('k') | content/browser/webui/web_ui_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/test_render_view_host.cc
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index b7842cfedf946233e0ef71ed0b03d3d3187d981e..06e884c733777935bf9633e4208e3adfbdc255ce 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -312,7 +312,11 @@ MockRenderProcessHost* RenderViewHostTestHarness::process() {
}
void RenderViewHostTestHarness::DeleteContents() {
- contents_.reset();
+ SetContents(NULL);
+}
+
+void RenderViewHostTestHarness::SetContents(TestTabContents* contents) {
+ contents_.reset(contents);
}
TestTabContents* RenderViewHostTestHarness::CreateTestTabContents() {
@@ -338,11 +342,11 @@ void RenderViewHostTestHarness::Reload() {
}
void RenderViewHostTestHarness::SetUp() {
- contents_.reset(CreateTestTabContents());
+ SetContents(CreateTestTabContents());
}
void RenderViewHostTestHarness::TearDown() {
- contents_.reset();
+ SetContents(NULL);
// Make sure that we flush any messages related to TabContents destruction
// before we destroy the profile.
« no previous file with comments | « content/browser/renderer_host/test_render_view_host.h ('k') | content/browser/webui/web_ui_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698