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

chrome/chrome_tests.gypi

 # 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.
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 469 matching lines @@
         '../third_party/npapi/npapi.gyp:npapi',
         # Runtime dependencies
         '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../webkit/support/webkit_support.gyp:webkit_resources',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
         'browser/browser_keyevents_browsertest.cc',
         'browser/instant/instant_browsertest.cc',
         'browser/printing/print_dialog_cloud_interative_uitest.cc',
         'browser/task_manager/task_manager_browsertest_util.cc',
         'browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc',
         'browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc',
         'browser/ui/omnibox/omnibox_view_browsertest.cc',
@@ skipping 2137 matching lines @@
         # Runtime dependencies
         '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../third_party/mesa/mesa.gyp:osmesa',
         '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         'browser/accessibility/accessibility_extension_apitest.cc',
         'browser/app_controller_mac_browsertest.mm',
         'browser/autocomplete/autocomplete_browsertest.cc',
@@ skipping 780 matching lines @@
         '../webkit/webkit.gyp:test_shell_test_support',
         # Runtime dependencies
         '../third_party/mesa/mesa.gyp:osmesa',
         '../webkit/webkit.gyp:pull_in_copy_TestNetscapePlugIn',
       ],
       'include_dirs': [
         '..',
       ],
       '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',
         'app/chrome_command_ids.h',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         'test/base/chrome_render_view_test.cc',
         'test/base/chrome_render_view_test.h',
         'test/base/chrome_test_launcher.cc',
@@ skipping 129 matching lines @@
         '../testing/gtest.gyp:gtest',
         # This is the safebrowsing test server.
         '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
         '../ui/ui.gyp:ui_resources',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [
         'HAS_OUT_OF_PROC_TEST_RUNNER',
-        'BROWSER_TESTS_HEADER_OVERRIDE="chrome/test/base/in_process_browser_test.h"',
       ],
       'sources': [
         'app/chrome_dll.rc',
         'browser/safe_browsing/safe_browsing_test.cc',
         'test/base/chrome_test_launcher.cc',
       ],
       'conditions': [
         ['safe_browsing==0', {
           'sources!': [
             'browser/safe_browsing/safe_browsing_test.cc',
@@ skipping 276 matching lines @@
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       # 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',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
         'test/base/chrome_test_launcher.cc',
@@ skipping 130 matching lines @@
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       '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',
         'app/chrome_dll.rc',
         'app/chrome_dll_resource.h',
         'app/chrome_version.rc.version',
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sync/glue/session_model_associator.cc',
         'browser/sync/test/integration/autofill_helper.cc',
@@ skipping 642 matching lines @@
             'input_jars_paths': [
               '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
              ],
           },
           'includes': [ '../build/apk_test.gypi' ],
         },
       ],
     }],
   ],  # 'conditions'
 }