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

content/test/content_browser_test.h

Index: content/test/content_browser_test.h
===================================================================
--- content/test/content_browser_test.h	(revision 147044)
+++ content/test/content_browser_test.h	(working copy)
@@ -6,10 +6,15 @@
 #define CONTENT_TEST_CONTENT_BROWSER_TEST_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "content/public/test/browser_test.h"
 #include "content/test/browser_test_base.h"
 
 class ShellMainDelegate;
 
+namespace content {
+class Shell;
+}
+
 class ContentBrowserTest : public BrowserTestBase {
  protected:
   ContentBrowserTest();
@@ -22,8 +27,13 @@
   // BrowserTestBase:
   virtual void RunTestOnMainThreadLoop() OVERRIDE;
 
+  // Returns the window for the test.
+  content::Shell* shell() const { return shell_; }
+
  private:
   scoped_ptr<ShellMainDelegate> shell_main_delegate_;
+
+  content::Shell* shell_;
 };
 
 #endif  // CONTENT_TEST_CONTENT_BROWSER_TEST_H_