Move resource_dispatcher_host_unittest.cc to content_unittests now that all...

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@98271 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/renderer_host/render_widget_host_view_mac.mm

@@ -1165,12 +1165,6 @@ void RenderWidgetHostViewMac::SetTextInputActive(bool active) {
   }
 }
 
-// static
-void RenderWidgetHostView::GetDefaultScreenInfo(
-    WebKit::WebScreenInfo* results) {
-  *results = WebKit::WebScreenInfoFactory::screenInfo(NULL);
-}
-
 // RenderWidgetHostViewCocoa ---------------------------------------------------
 
 @implementation RenderWidgetHostViewCocoa

chrome/chrome_browser.gypi

@@ -4178,14 +4178,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',

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',

content/browser/renderer_host/render_widget_host_view.cc

@@ -4,6 +4,19 @@
 
 #include "content/browser/renderer_host/render_widget_host_view.h"
 
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebScreenInfoFactory.h"
+
+// TODO(jam): move this to render_widget_host_view_mac.mm when it moves to
+// content.
+#if defined(OS_MACOSX)
+// static
+void RenderWidgetHostView::GetDefaultScreenInfo(
+    WebKit::WebScreenInfo* results) {
+  *results = WebKit::WebScreenInfoFactory::screenInfo(NULL);
+}
+#endif
+
 RenderWidgetHostView::~RenderWidgetHostView() {}
 
 void RenderWidgetHostView::SetBackground(const SkBitmap& background) {

content/content_browser.gypi

@@ -546,6 +546,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',
           ],
@@ -566,6 +574,11 @@
             ['exclude', '^browser/geolocation/wifi_data_provider_linux.h'],
           ]
         }],
+        ['OS=="linux" and toolkit_views==1',{
+          'dependencies': [
+            '../views/views.gyp:views',
+          ],
+        }],
         ['OS=="mac"', {
           'sources!': [
             'browser/power_save_blocker_stub.cc',

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',