Get content_browsertest working. I've added a simple test for now, and will convert the tests in sr…

content/test/content_browser_test.cc

Index: content/test/content_browser_test.cc
===================================================================
--- content/test/content_browser_test.cc	(revision 147044)
+++ content/test/content_browser_test.cc	(working copy)
@@ -5,6 +5,7 @@
 #include "content/test/content_browser_test.h"
 
 #include "base/debug/stack_trace.h"
+#include "base/logging.h"
 #include "base/message_loop.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_main_delegate.h"
@@ -21,7 +22,6 @@
 }
 
 void ContentBrowserTest::SetUp() {
-  DCHECK(!content::GetContentClient());
   shell_main_delegate_.reset(new ShellMainDelegate);
   shell_main_delegate_->PreSandboxStartup();
 
@@ -45,6 +45,9 @@
 #endif  // defined(OS_POSIX)
 
 void ContentBrowserTest::RunTestOnMainThreadLoop() {
+  CHECK_EQ(content::Shell::GetWindows().size(), 1u);
+  shell_ = content::Shell::GetWindows()[0];
+
 #if defined(OS_POSIX)
   signal(SIGTERM, DumpStackTraceSignalHandler);
 #endif  // defined(OS_POSIX)
@@ -71,9 +74,4 @@
 #if defined(OS_MACOSX)
   pool.Recycle();
 #endif
-
-  MessageLoopForUI::current()->Quit();
-#if defined(OS_MACOSX)
-  pool.Recycle();
-#endif
 }