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

Unified Diff: content/browser/tab_contents/render_view_host_manager_unittest.cc

Issue 9706012: Add abstractions that let embedders drive tests of WebContents. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove CONTENT_EXPORT on statically linked functions. Merge to head for commit. Created 8 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
Index: content/browser/tab_contents/render_view_host_manager_unittest.cc
diff --git a/content/browser/tab_contents/render_view_host_manager_unittest.cc b/content/browser/tab_contents/render_view_host_manager_unittest.cc
index 5ac2cbf8bd64645527851f1077d543d9ad57504e..27628423760ba195eb03520689d52495ba720ebc 100644
--- a/content/browser/tab_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/tab_contents/render_view_host_manager_unittest.cc
@@ -132,16 +132,16 @@ class RenderViewHostManagerTest
: public RenderViewHostImplTestHarness {
public:
virtual void SetUp() OVERRIDE {
- RenderViewHostTestHarness::SetUp();
+ RenderViewHostImplTestHarness::SetUp();
old_client_ = content::GetContentClient();
- content::SetContentClient(&client_);
old_browser_client_ = content::GetContentClient()->browser();
+ content::SetContentClient(&client_);
content::GetContentClient()->set_browser(&browser_client_);
url_util::AddStandardScheme(chrome::kChromeUIScheme);
}
virtual void TearDown() OVERRIDE {
- RenderViewHostTestHarness::TearDown();
+ RenderViewHostImplTestHarness::TearDown();
content::GetContentClient()->set_browser(old_browser_client_);
content::SetContentClient(old_client_);
}

Powered by Google App Engine
This is Rietveld 408576698