summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 01:43:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-25 01:43:20 +0000
commite0f5d4ce144375c4b55eca8a091e84dbdcb09861 (patch)
tree15df1a14685b18ba52d18cfb27e80b7fac57314f
parentb46661fefd56c2061e36a5a47a6c1289f7d6f6c5 (diff)
downloadchromium_src-e0f5d4ce144375c4b55eca8a091e84dbdcb09861.zip
chromium_src-e0f5d4ce144375c4b55eca8a091e84dbdcb09861.tar.gz
chromium_src-e0f5d4ce144375c4b55eca8a091e84dbdcb09861.tar.bz2
Move resource_dispatcher_host_unittest.cc to content_unittests now that all its link time dependencies are in content.
BUG=90443 Review URL: http://codereview.chromium.org/7746008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98164 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_browser.gypi8
-rw-r--r--chrome/chrome_tests.gypi1
-rw-r--r--content/content_browser.gypi8
-rw-r--r--content/content_tests.gypi1
4 files changed, 9 insertions, 9 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5e8829d..e4454bf 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4182,14 +4182,6 @@
'../views/views.gyp:views',
'../views/views.gyp:views_desktop_lib',
],
- 'direct_dependent_settings': {
- 'link_settings': {
- 'libraries': [
- '-llocationapi.lib',
- '-lsensorsapi.lib',
- ],
- }
- },
'sources': [
'browser/first_run/upgrade_util.cc',
'browser/first_run/upgrade_util.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 71d677f..c21d375 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2021,7 +2021,6 @@
'../content/browser/plugin_service_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/site_instance_unittest.cc',
'../content/browser/tab_contents/navigation_controller_unittest.cc',
'../content/browser/tab_contents/navigation_entry_unittest.cc',
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index a78751a..d2240fd 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -544,6 +544,14 @@
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'../third_party/isimpledom/isimpledom.gyp:isimpledom',
],
+ 'direct_dependent_settings': {
+ 'link_settings': {
+ 'libraries': [
+ '-llocationapi.lib',
+ '-lsensorsapi.lib',
+ ],
+ }
+ },
'sources!': [
'browser/power_save_blocker_stub.cc',
],
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index f1124aa..817cf28 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -90,6 +90,7 @@
'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc',
'browser/renderer_host/media/video_capture_host_unittest.cc',
'browser/renderer_host/media/video_capture_manager_unittest.cc',
+ 'browser/renderer_host/resource_dispatcher_host_unittest.cc',
'browser/renderer_host/resource_queue_unittest.cc',
'browser/resolve_proxy_msg_helper_unittest.cc',
'browser/speech/endpointer/endpointer_unittest.cc',