Change blink::WebScreenInfo to content::ScreenInfo

content/renderer/render_widget_browsertest.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/common/resize_params.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget.h"
 
 namespace content {
@@ skipping 14 matching lines @@
 
   bool next_paint_is_resize_ack() {
     return widget()->next_paint_is_resize_ack();
   }
 };
 
 TEST_F(RenderWidgetTest, OnResize) {
   // The initial bounds is empty, so setting it to the same thing should do
   // nothing.
   ResizeParams resize_params;
-  resize_params.screen_info = blink::WebScreenInfo();
+  resize_params.screen_info = ScreenInfo();
   resize_params.new_size = gfx::Size();
   resize_params.physical_backing_size = gfx::Size();
   resize_params.top_controls_height = 0.f;
   resize_params.top_controls_shrink_blink_size = false;
   resize_params.resizer_rect = gfx::Rect();
   resize_params.is_fullscreen_granted = false;
   resize_params.needs_resize_ack = false;
   OnResize(resize_params);
   EXPECT_EQ(resize_params.needs_resize_ack, next_paint_is_resize_ack());
 
@@ skipping 19 matching lines @@
   OnResize(resize_params);
   EXPECT_EQ(resize_params.needs_resize_ack, next_paint_is_resize_ack());
 
   // Resetting the rect to empty should not send the ack.
   resize_params.new_size = gfx::Size();
   resize_params.physical_backing_size = gfx::Size();
   OnResize(resize_params);
   EXPECT_EQ(resize_params.needs_resize_ack, next_paint_is_resize_ack());
 
   // Changing the screen info should not send the ack.
-  resize_params.screen_info.orientationAngle = 90;
+  resize_params.screen_info.orientation_angle = 90;
   OnResize(resize_params);
   EXPECT_EQ(resize_params.needs_resize_ack, next_paint_is_resize_ack());
 
-  resize_params.screen_info.orientationType =
-      blink::WebScreenOrientationPortraitPrimary;
+  resize_params.screen_info.orientation_type =
+      SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
   OnResize(resize_params);
   EXPECT_EQ(resize_params.needs_resize_ack, next_paint_is_resize_ack());
 }
 
 class RenderWidgetInitialSizeTest : public RenderWidgetTest {
  public:
   RenderWidgetInitialSizeTest()
       : RenderWidgetTest(), initial_size_(200, 100) {}
 
  protected:
@@ skipping 42 matching lines @@
   LoadHTML("<div>NOT EDITABLE</div>");
   gfx::Range range;
   GetCompositionRange(&range);
   // If this test ever starts failing, one likely outcome is that WebRange
   // and gfx::Range::InvalidRange are no longer expressed in the same
   // values of start/end.
   EXPECT_FALSE(range.IsValid());
 }
 
 }  // namespace content