Merge 140030 - Revert 124453 - WebWidgetClient::screenInfo() no longer does a synchronous IPC.

content/test/render_view_test.cc

 // 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.
 
 #include "content/test/render_view_test.h"
 
 #include "content/common/view_messages.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
 #include "content/test/mock_render_process.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptController.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/dom_storage/dom_storage_types.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_LINUX) && !defined(USE_AURA)
 #include "ui/base/gtk/event_synthesis_gtk.h"
 #endif
@@ skipping 132 matching lines @@
       content::RendererPreferences(),
       WebPreferences(),
       new SharedRenderViewCounter(0),
       kRouteId,
       kSurfaceId,
       dom_storage::kInvalidSessionStorageNamespaceId,
       string16(),
       false,
       false,
       1,
-      WebKit::WebScreenInfo(),
       false,
       AccessibilityModeOff);
   view->AddRef();
   view_ = view;
 
   // Attach a pseudo keyboard device to this object.
   mock_keyboard_.reset(new MockKeyboard());
 }
 
 void RenderViewTest::TearDown() {
@@ skipping 276 matching lines @@
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   impl->set_send_content_state_immediately(true);
 }
 
 WebKit::WebWidget* RenderViewTest::GetWebWidget() {
   RenderViewImpl* impl = static_cast<RenderViewImpl*>(view_);
   return impl->webwidget();
 }
 
 }  // namespace content