Make an empty content browser test work.

content/test/content_browser_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/content_browser_test.h"
 
 #include "base/debug/stack_trace.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/message_loop.h"
+#include "content/shell/shell_main_delegate.h"
 #include "content/test/test_content_client.h"
 
 ContentBrowserTest::ContentBrowserTest() {
 }
 
 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();
 }
 
 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)
 // On SIGTERM (sent by the runner on timeouts), dump a stack trace (to make
 // debugging easier) and also exit with a known error code (so that the test
 // framework considers this a failure -- http://crbug.com/57578).
 static void DumpStackTraceSignalHandler(int signal) {
   base::debug::StackTrace().PrintBacktrace();
   _exit(128 + signal);
 }
@@ skipping 16 matching lines @@
   // Pump startup related events.
   MessageLoopForUI::current()->RunAllPending();
   pool.Recycle();
 
   RunTestOnMainThread();
   pool.Recycle();
 
   MessageLoopForUI::current()->Quit();
   pool.Recycle();
 }