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

content/public/test/browser_test.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_TEST_BROWSER_TEST_H_
 #define CONTENT_TEST_BROWSER_TEST_H_
 
 // We only want to use InProcessBrowserTest in test targets which properly
 // isolate each test case by running each test in a separate process.
 // This way if a test hangs the test launcher can reliably terminate it.
 //
 // InProcessBrowserTest cannot be run more than once in the same address space
 // anyway - otherwise the second test crashes.
 #if defined(HAS_OUT_OF_PROC_TEST_RUNNER)
 
-#if defined(BROWSER_TESTS_HEADER_OVERRIDE)
-#include BROWSER_TESTS_HEADER_OVERRIDE
-#else
-#include "content/test/content_browser_test.h"
-typedef ContentBrowserTest InProcessBrowserTest;
-#endif
-
 #include "base/compiler_specific.h"
 
 #define IN_PROC_BROWSER_TEST_(test_case_name, test_name, parent_class,\
                               parent_id)\
 class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) : public parent_class {\
  public:\
   GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
  protected:\
   virtual void RunTestOnMainThread() OVERRIDE;\
  private:\
@@ skipping 42 matching lines @@
         GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
   }; \
   int GTEST_TEST_CLASS_NAME_(test_case_name, \
                              test_name)::gtest_registering_dummy_ = \
       GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
   void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
 
 #endif  // defined(HAS_OUT_OF_PROC_TEST_RUNNER)
 
 #endif  // CONTENT_TEST_BROWSER_TEST_H_