Change blink::WebScreenInfo to content::ScreenInfo

content/browser/renderer_host/render_widget_host_view_base.cc

Index: content/browser/renderer_host/render_widget_host_view_base.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index b41c4f1f9dfa9ce6b5cb823048d42ec6cd5e0b66..a8e8627bbed8b87f92ddea9d39241ca46e3a50e2 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -356,8 +356,7 @@ void RenderWidgetHostViewBase::SetInsets(const gfx::Insets& insets) {
 }
 
 // static
-blink::WebScreenOrientationType
-RenderWidgetHostViewBase::GetOrientationTypeForMobile(
+ScreenOrientationValues RenderWidgetHostViewBase::GetOrientationTypeForMobile(
     const display::Display& display) {
   int angle = display.RotationAsDegree();
   const gfx::Rect& bounds = display.bounds();
@@ -371,26 +370,25 @@ RenderWidgetHostViewBase::GetOrientationTypeForMobile(
 
   switch (angle) {
   case 0:
-    return natural_portrait ? blink::WebScreenOrientationPortraitPrimary
-                           : blink::WebScreenOrientationLandscapePrimary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY
+                            : SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
   case 90:
-    return natural_portrait ? blink::WebScreenOrientationLandscapePrimary
-                           : blink::WebScreenOrientationPortraitSecondary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY
+                            : SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY;
   case 180:
-    return natural_portrait ? blink::WebScreenOrientationPortraitSecondary
-                           : blink::WebScreenOrientationLandscapeSecondary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY
+                            : SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY;
   case 270:
-    return natural_portrait ? blink::WebScreenOrientationLandscapeSecondary
-                           : blink::WebScreenOrientationPortraitPrimary;
+    return natural_portrait ? SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY
+                            : SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
   default:
     NOTREACHED();
-    return blink::WebScreenOrientationPortraitPrimary;
+    return SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
   }
 }
 
 // static
-blink::WebScreenOrientationType
-RenderWidgetHostViewBase::GetOrientationTypeForDesktop(
+ScreenOrientationValues RenderWidgetHostViewBase::GetOrientationTypeForDesktop(
     const display::Display& display) {
   static int primary_landscape_angle = -1;
   static int primary_portrait_angle = -1;
@@ -407,13 +405,13 @@ RenderWidgetHostViewBase::GetOrientationTypeForDesktop(
 
   if (is_portrait) {
     return primary_portrait_angle == angle
-        ? blink::WebScreenOrientationPortraitPrimary
-        : blink::WebScreenOrientationPortraitSecondary;
+        ? SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY
+        : SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY;
   }
 
   return primary_landscape_angle == angle
-      ? blink::WebScreenOrientationLandscapePrimary
-      : blink::WebScreenOrientationLandscapeSecondary;
+      ? SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY
+      : SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY;
 }
 
 void RenderWidgetHostViewBase::OnDidNavigateMainFrameToNewPage() {