diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 21:59:33 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 21:59:33 +0000 |
| commit | c1f87b2a4f2d08b92db6f0c7f4f6661d5166feb9 (patch) | |
| tree | d1348080214f9bab7a2f3d2b7f6e474b55cb24d5 /content/test/content_browser_test.cc | |
| parent | 5435643695ec7f4e77fd4a2cda5bfa1222ec198f (diff) | |
| download | chromium_src-c1f87b2a4f2d08b92db6f0c7f4f6661d5166feb9.zip chromium_src-c1f87b2a4f2d08b92db6f0c7f4f6661d5166feb9.tar.gz chromium_src-c1f87b2a4f2d08b92db6f0c7f4f6661d5166feb9.tar.bz2 | |
Make an empty content browser test work.
BUG=90448
Review URL: http://codereview.chromium.org/8137012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104181 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.cc')
| -rw-r--r-- | content/test/content_browser_test.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index f43c011..2f97e0e 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -7,6 +7,8 @@ #include "base/debug/stack_trace.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/message_loop.h" +#include "content/shell/shell.h" +#include "content/shell/shell_main_delegate.h" #include "content/test/test_content_client.h" ContentBrowserTest::ContentBrowserTest() { @@ -17,11 +19,8 @@ ContentBrowserTest::~ContentBrowserTest() { void ContentBrowserTest::SetUp() { DCHECK(!content::GetContentClient()); - content_client_.reset(new TestContentClient); - content::SetContentClient(content_client_.get()); - - content_browser_client_.reset(new content::MockContentBrowserClient()); - content_client_->set_browser(content_browser_client_.get()); + shell_main_delegate_.reset(new ShellMainDelegate); + shell_main_delegate_->PreSandboxStartup(); BrowserTestBase::SetUp(); } @@ -29,11 +28,7 @@ void ContentBrowserTest::SetUp() { void ContentBrowserTest::TearDown() { BrowserTestBase::TearDown(); - DCHECK_EQ(content_client_.get(), content::GetContentClient()); - content::SetContentClient(NULL); - content_client_.reset(); - - content_browser_client_.reset(); + shell_main_delegate_.reset(); } #if defined(OS_POSIX) |