summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 00:46:44 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 00:46:44 +0000
commit79ea4860d2a22403dbbdda865b2a360afbc3afbe (patch)
treea7a0b02aa35d620084adb6634c7b11769d415ac7 /chrome/chrome_tests.gypi
parent0651b818c7122d319954ff5bc30dff68ba8b9013 (diff)
downloadchromium_src-79ea4860d2a22403dbbdda865b2a360afbc3afbe.zip
chromium_src-79ea4860d2a22403dbbdda865b2a360afbc3afbe.tar.gz
chromium_src-79ea4860d2a22403dbbdda865b2a360afbc3afbe.tar.bz2
Move files out of chrome\browser\renderer_host\test alongside their source. Most of them went to content\browser\renderer_host.
Review URL: http://codereview.chromium.org/6575009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi29
1 files changed, 14 insertions, 15 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index b2d9bbd..c57ec63 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -83,10 +83,6 @@
'browser/prefs/pref_service_mock_builder.h',
'browser/prefs/testing_pref_store.cc',
'browser/prefs/testing_pref_store.h',
- 'browser/renderer_host/test/test_backing_store.cc',
- 'browser/renderer_host/test/test_backing_store.h',
- 'browser/renderer_host/test/test_render_view_host.cc',
- 'browser/renderer_host/test/test_render_view_host.h',
'browser/sessions/session_service_test_helper.cc',
'browser/sessions/session_service_test_helper.h',
'browser/sync/profile_sync_service_mock.cc',
@@ -179,6 +175,10 @@
'test/values_test_util.h',
'../content/browser/renderer_host/mock_render_process_host.cc',
'../content/browser/renderer_host/mock_render_process_host.h',
+ '../content/browser/renderer_host/test_backing_store.cc',
+ '../content/browser/renderer_host/test_backing_store.h',
+ '../content/browser/renderer_host/test_render_view_host.cc',
+ '../content/browser/renderer_host/test_render_view_host.h',
'../content/browser/tab_contents/test_tab_contents.cc',
'../content/browser/tab_contents/test_tab_contents.h',
],
@@ -1450,8 +1450,6 @@
'browser/renderer_host/gtk_im_context_wrapper_unittest.cc',
'browser/renderer_host/gtk_key_bindings_handler_unittest.cc',
'browser/renderer_host/render_widget_host_view_mac_unittest.mm',
- 'browser/renderer_host/test/render_view_host_unittest.cc',
- 'browser/renderer_host/test/site_instance_unittest.cc',
'browser/renderer_host/web_cache_manager_unittest.cc',
'browser/resources_util_unittest.cc',
'browser/rlz/rlz_unittest.cc',
@@ -1853,9 +1851,11 @@
'../content/browser/host_zoom_map_unittest.cc',
'../content/browser/plugin_service_unittest.cc',
'../content/browser/renderer_host/audio_renderer_host_unittest.cc',
+ '../content/browser/renderer_host/render_view_host_unittest.cc',
'../content/browser/renderer_host/render_widget_host_unittest.cc',
'../content/browser/renderer_host/resource_dispatcher_host_unittest.cc',
'../content/browser/renderer_host/resource_queue_unittest.cc',
+ '../content/browser/site_instance_unittest.cc',
'../content/browser/tab_contents/navigation_controller_unittest.cc',
'../content/browser/tab_contents/navigation_entry_unittest.cc',
'../content/browser/tab_contents/render_view_host_manager_unittest.cc',
@@ -2129,6 +2129,7 @@
'app/chrome_dll.rc',
'app/chrome_dll_resource.h',
'app/chrome_dll_version.rc.version',
+ 'browser/accessibility/renderer_accessibility_browsertest.cc',
'browser/autocomplete/autocomplete_browsertest.cc',
'browser/autofill/form_structure_browsertest.cc',
'browser/browser_browsertest.cc',
@@ -2269,11 +2270,7 @@
'browser/popup_blocker_browsertest.cc',
'browser/prerender/prerender_browsertest.cc',
'browser/printing/print_dialog_cloud_uitest.cc',
- 'browser/renderer_host/test/render_process_host_browsertest.cc',
- 'browser/renderer_host/test/render_view_host_browsertest.cc',
- 'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
- 'browser/renderer_host/test/renderer_accessibility_browsertest.cc',
- 'browser/renderer_host/test/web_cache_manager_browsertest.cc',
+ 'browser/renderer_host/web_cache_manager_browsertest.cc',
'browser/safe_browsing/safe_browsing_blocking_page_test.cc',
'browser/safe_browsing/safe_browsing_service_browsertest.cc',
'browser/service/service_process_control_browsertest.cc',
@@ -2326,6 +2323,9 @@
'test/render_view_test.h',
'../content/browser/child_process_security_policy_browsertest.cc',
'../content/browser/plugin_service_browsertest.cc',
+ '../content/browser/renderer_host/render_process_host_browsertest.cc',
+ '../content/browser/renderer_host/render_view_host_browsertest.cc',
+ '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
],
'conditions': [
['chromeos==0', {
@@ -2399,11 +2399,10 @@
'app/chrome_dll_resource.h',
'app/chrome_dll_version.rc.version',
'browser/extensions/extension_rlz_apitest.cc',
- # TODO(jam): http://crbug.com/15101 These tests fail on Linux and
- # Mac.
+ # http://crbug.com/15101 These tests fail on Linux and Mac.
+ 'browser/renderer_host/web_cache_manager_browsertest.cc',
'../content/browser/child_process_security_policy_browsertest.cc',
- 'browser/renderer_host/test/web_cache_manager_browsertest.cc',
- 'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
+ '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
],
}],
['OS=="linux"', {