Change blink::WebScreenInfo to content::ScreenInfo

content/browser/renderer_host/render_widget_host_view_base_unittest.cc

Index: content/browser/renderer_host/render_widget_host_view_base_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_base_unittest.cc b/content/browser/renderer_host/render_widget_host_view_base_unittest.cc
index acce950d8172d5e2609de4b727bf6af5e038a85c..7de3c10406fcbdee565723f99668c383cfef4d41 100644
--- a/content/browser/renderer_host/render_widget_host_view_base_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base_unittest.cc
@@ -26,57 +26,57 @@ TEST(RenderWidgetHostViewBaseTest, OrientationTypeForMobile) {
   // Square display (width == height).
   {
     display::Display display = CreateDisplay(100, 100, 0);
-    EXPECT_EQ(blink::WebScreenOrientationPortraitPrimary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(200, 200, 90);
-    EXPECT_EQ(blink::WebScreenOrientationLandscapePrimary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(0, 0, 180);
-    EXPECT_EQ(blink::WebScreenOrientationPortraitSecondary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(10000, 10000, 270);
-    EXPECT_EQ(blink::WebScreenOrientationLandscapeSecondary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
   }
 
   // natural width > natural height.
   {
     display::Display display = CreateDisplay(1, 0, 0);
-    EXPECT_EQ(blink::WebScreenOrientationLandscapePrimary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(19999, 20000, 90);
-    EXPECT_EQ(blink::WebScreenOrientationPortraitSecondary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(200, 100, 180);
-    EXPECT_EQ(blink::WebScreenOrientationLandscapeSecondary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(1, 10000, 270);
-    EXPECT_EQ(blink::WebScreenOrientationPortraitPrimary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
   }
 
   // natural width < natural height.
   {
     display::Display display = CreateDisplay(0, 1, 0);
-    EXPECT_EQ(blink::WebScreenOrientationPortraitPrimary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(20000, 19999, 90);
-    EXPECT_EQ(blink::WebScreenOrientationLandscapePrimary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(100, 200, 180);
-    EXPECT_EQ(blink::WebScreenOrientationPortraitSecondary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
 
     display = CreateDisplay(10000, 1, 270);
-    EXPECT_EQ(blink::WebScreenOrientationLandscapeSecondary,
+    EXPECT_EQ(SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY,
               RenderWidgetHostViewBase::GetOrientationTypeForMobile(display));
   }
 }
@@ -91,30 +91,30 @@ TEST(RenderWidgetHostViewBaseTest, OrientationTypeForDesktop) {
   // natural width > natural height.
   {
     display::Display display = CreateDisplay(1, 0, 0);
-    blink::WebScreenOrientationType landscape_1 =
+    ScreenOrientationValues landscape_1 =
         RenderWidgetHostViewBase::GetOrientationTypeForDesktop(display);
-    EXPECT_TRUE(landscape_1 == blink::WebScreenOrientationLandscapePrimary ||
-                landscape_1 == blink::WebScreenOrientationLandscapeSecondary);
+    EXPECT_TRUE(landscape_1 == SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY ||
+                landscape_1 == SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY);
 
     display = CreateDisplay(200, 100, 180);
-    blink::WebScreenOrientationType landscape_2 =
+    ScreenOrientationValues landscape_2 =
         RenderWidgetHostViewBase::GetOrientationTypeForDesktop(display);
-    EXPECT_TRUE(landscape_2 == blink::WebScreenOrientationLandscapePrimary ||
-                landscape_2 == blink::WebScreenOrientationLandscapeSecondary);
+    EXPECT_TRUE(landscape_2 == SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY ||
+                landscape_2 == SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY);
 
     EXPECT_NE(landscape_1, landscape_2);
 
     display = CreateDisplay(19999, 20000, 90);
-    blink::WebScreenOrientationType portrait_1 =
+    ScreenOrientationValues portrait_1 =
         RenderWidgetHostViewBase::GetOrientationTypeForDesktop(display);
-    EXPECT_TRUE(portrait_1 == blink::WebScreenOrientationPortraitPrimary ||
-                portrait_1 == blink::WebScreenOrientationPortraitSecondary);
+    EXPECT_TRUE(portrait_1 == SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY ||
+                portrait_1 == SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY);
 
     display = CreateDisplay(1, 10000, 270);
-    blink::WebScreenOrientationType portrait_2 =
+    ScreenOrientationValues portrait_2 =
         RenderWidgetHostViewBase::GetOrientationTypeForDesktop(display);
-    EXPECT_TRUE(portrait_2 == blink::WebScreenOrientationPortraitPrimary ||
-                portrait_2 == blink::WebScreenOrientationPortraitSecondary);
+    EXPECT_TRUE(portrait_2 == SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY ||
+                portrait_2 == SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY);
 
     EXPECT_NE(portrait_1, portrait_2);