| Index: content/public/test/content_browser_test.cc
|
| diff --git a/content/public/test/content_browser_test.cc b/content/public/test/content_browser_test.cc
|
| index a6802124f9c59e70e1382c5d7bdb95fd851a364a..6bcea4c64f5e2ba99e35b61a8610d21d9efe60cd 100644
|
| --- a/content/public/test/content_browser_test.cc
|
| +++ b/content/public/test/content_browser_test.cc
|
| @@ -35,8 +35,7 @@
|
|
|
| namespace content {
|
|
|
| -ContentBrowserTest::ContentBrowserTest()
|
| - : setup_called_(false) {
|
| +ContentBrowserTest::ContentBrowserTest() {
|
| #if defined(OS_MACOSX)
|
| // See comment in InProcessBrowserTest::InProcessBrowserTest().
|
| base::FilePath content_shell_path;
|
| @@ -56,8 +55,6 @@ ContentBrowserTest::ContentBrowserTest()
|
| }
|
|
|
| ContentBrowserTest::~ContentBrowserTest() {
|
| - CHECK(setup_called_) << "Overridden SetUp() did not call parent "
|
| - "implementation, so test not run.";
|
| }
|
|
|
| void ContentBrowserTest::SetUp() {
|
| @@ -97,8 +94,6 @@ void ContentBrowserTest::SetUp() {
|
| ui::InitializeInputMethodForTesting();
|
| #endif
|
|
|
| - setup_called_ = true;
|
| -
|
| BrowserTestBase::SetUp();
|
| }
|
|
|
|
|