Change blink::WebScreenInfo to content::ScreenInfo

content/browser/renderer_host/render_widget_host_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
 
@@ skipping 364 matching lines @@
   }
 
   void set_prehandle_keyboard_event_is_shortcut(bool is_shortcut) {
     prehandle_keyboard_event_is_shortcut_ = is_shortcut;
   }
 
   bool handle_wheel_event_called() const { return handle_wheel_event_called_; }
 
   bool unresponsive_timer_fired() const { return unresponsive_timer_fired_; }
 
-  void SetScreenInfo(const blink::WebScreenInfo& screen_info) {
+  void SetScreenInfo(const ScreenInfo& screen_info) {
     screen_info_ = screen_info;
   }
 
   // RenderWidgetHostDelegate overrides.
-  void GetScreenInfo(blink::WebScreenInfo* web_screen_info) override {
-    *web_screen_info = screen_info_;
+  void GetScreenInfo(ScreenInfo* screen_info) override {
+    *screen_info = screen_info_;
   }
 
  protected:
   bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                               bool* is_keyboard_shortcut) override {
     prehandle_keyboard_event_type_ = event.type;
     prehandle_keyboard_event_called_ = true;
     *is_keyboard_shortcut = prehandle_keyboard_event_is_shortcut_;
     return prehandle_keyboard_event_;
   }
@@ skipping 25 matching lines @@
   WebInputEvent::Type prehandle_keyboard_event_type_;
 
   bool unhandled_keyboard_event_called_;
   WebInputEvent::Type unhandled_keyboard_event_type_;
 
   bool handle_wheel_event_;
   bool handle_wheel_event_called_;
 
   bool unresponsive_timer_fired_;
 
-  blink::WebScreenInfo screen_info_;
+  ScreenInfo screen_info_;
 };
 
 // RenderWidgetHostTest --------------------------------------------------------
 
 class RenderWidgetHostTest : public testing::Test {
  public:
   RenderWidgetHostTest()
       : process_(NULL),
         handle_key_press_event_(false),
         handle_mouse_event_(false),
@@ skipping 339 matching lines @@
 
   // A different size should be sent again, however.
   view_->set_bounds(gfx::Rect(0, 0, 0, 31));
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
   EXPECT_EQ(gfx::Size(0, 31), host_->old_resize_params_->new_size);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
 }
 
 // Test that a resize event is sent if WasResized() is called after a
-// WebScreenInfo change.
+// ScreenInfo change.
 TEST_F(RenderWidgetHostTest, ResizeScreenInfo) {
-  blink::WebScreenInfo screen_info;
-  screen_info.deviceScaleFactor = 1.f;
+  ScreenInfo screen_info;
+  screen_info.device_scale_factor = 1.f;
   screen_info.rect = blink::WebRect(0, 0, 800, 600);
-  screen_info.availableRect = blink::WebRect(0, 0, 800, 600);
-  screen_info.orientationAngle = 0;
-  screen_info.orientationType = blink::WebScreenOrientationPortraitPrimary;
+  screen_info.available_rect = blink::WebRect(0, 0, 800, 600);
+  screen_info.orientation_angle = 0;
+  screen_info.orientation_type = SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
 
   auto host_delegate =
       static_cast<MockRenderWidgetHostDelegate*>(host_->delegate());
 
   host_delegate->SetScreenInfo(screen_info);
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
   process_->sink().ClearMessages();
 
-  screen_info.orientationAngle = 180;
-  screen_info.orientationType = blink::WebScreenOrientationLandscapePrimary;
+  screen_info.orientation_angle = 180;
+  screen_info.orientation_type = SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
 
   host_delegate->SetScreenInfo(screen_info);
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
   process_->sink().ClearMessages();
 
-  screen_info.deviceScaleFactor = 2.f;
+  screen_info.device_scale_factor = 2.f;
 
   host_delegate->SetScreenInfo(screen_info);
   host_->WasResized();
   EXPECT_FALSE(host_->resize_ack_pending_);
   EXPECT_TRUE(process_->sink().GetUniqueMessageMatching(ViewMsg_Resize::ID));
   process_->sink().ClearMessages();
 
   // No screen change.
   host_delegate->SetScreenInfo(screen_info);
   host_->WasResized();
@@ skipping 872 matching lines @@
                                       ui::LatencyInfo());
 
 
   // Tests RWHI::ForwardWheelEventWithLatencyInfo().
   SimulateWheelEventWithLatencyInfo(-5, 0, 0, true, ui::LatencyInfo());
 
   ASSERT_FALSE(host_->input_router()->HasPendingEvents());
 }
 
 }  // namespace content