From eabbfb19a4edd46aa81b03f9c695a6f70789b8bd Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Fri, 5 Apr 2013 23:28:35 +0000 Subject: Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The main reasons are that it makes content's embedder interfaces harder to change if they're reused by the embedder, and that its makes it confusing for embedder code when there are multiple ways to do the same thing. BUG=227047 Review URL: https://codereview.chromium.org/13409003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192649 0039d316-1c4b-4281-b951-d872f2087c98 --- content/test/content_test_launcher.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'content/test/content_test_launcher.cc') 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); -- cgit v1.1