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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 147044)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -487,7 +487,6 @@
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
-        'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
       'sources': [
         'browser/browser_focus_uitest.cc',
@@ -2645,7 +2644,6 @@
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
-        'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
@@ -3446,7 +3444,6 @@
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
-        'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
@@ -3596,7 +3593,6 @@
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
-        'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
       'sources': [
         'app/chrome_dll.rc',
@@ -3893,7 +3889,6 @@
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
-        'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
       'sources': [
         'app/chrome_command_ids.h',
@@ -4044,7 +4039,6 @@
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
-        'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
       'sources': [
         'app/chrome_command_ids.h',