summaryrefslogtreecommitdiffstats
path: root/content/test/content_test_launcher.cc
diff options
context:
space:
mode:
Diffstat (limited to 'content/test/content_test_launcher.cc')
-rw-r--r--content/test/content_test_launcher.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index aa1f362..2a662e7 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -36,15 +36,13 @@ class ContentShellTestSuiteInitializer
}
virtual void OnTestStart(const testing::TestInfo& test_info) OVERRIDE {
- DCHECK(!GetContentClient());
content_client_.reset(new ShellContentClient);
browser_content_client_.reset(new ShellContentBrowserClient());
- content_client_->set_browser_for_testing(browser_content_client_.get());
SetContentClient(content_client_.get());
+ SetBrowserClientForTesting(browser_content_client_.get());
}
virtual void OnTestEnd(const testing::TestInfo& test_info) OVERRIDE {
- DCHECK_EQ(content_client_.get(), GetContentClient());
browser_content_client_.reset();
content_client_.reset();
SetContentClient(NULL);