Change blink::WebScreenInfo to content::ScreenInfo

content/browser/screen_orientation/screen_orientation_browsertest.cc

Index: content/browser/screen_orientation/screen_orientation_browsertest.cc
diff --git a/content/browser/screen_orientation/screen_orientation_browsertest.cc b/content/browser/screen_orientation/screen_orientation_browsertest.cc
index cd6b6d21cc73b6c31c5fbccc91e2a1b1717415ac..540fc43360ab7fd3e052c7a2eb8fae2454ab6f76 100644
--- a/content/browser/screen_orientation/screen_orientation_browsertest.cc
+++ b/content/browser/screen_orientation/screen_orientation_browsertest.cc
@@ -20,7 +20,6 @@
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/common/shell_switches.h"
-#include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "ui/compositor/compositor_switches.h"
 
 namespace content {
@@ -34,22 +33,22 @@ class ScreenOrientationBrowserTest : public ContentBrowserTest  {
   void SendFakeScreenOrientation(unsigned angle, const std::string& strType) {
     RenderWidgetHost* rwh = shell()->web_contents()->GetRenderWidgetHostView()
         ->GetRenderWidgetHost();
-    blink::WebScreenInfo screen_info;
-    rwh->GetWebScreenInfo(&screen_info);
-    screen_info.orientationAngle = angle;
+    ScreenInfo screen_info;
+    rwh->GetScreenInfo(&screen_info);
+    screen_info.orientation_angle = angle;
 
-    blink::WebScreenOrientationType type = blink::WebScreenOrientationUndefined;
+    ScreenOrientationValues type = SCREEN_ORIENTATION_VALUES_DEFAULT;
     if (strType == "portrait-primary") {
-      type = blink::WebScreenOrientationPortraitPrimary;
+      type = SCREEN_ORIENTATION_VALUES_PORTRAIT_PRIMARY;
     } else if (strType == "portrait-secondary") {
-      type = blink::WebScreenOrientationPortraitSecondary;
+      type = SCREEN_ORIENTATION_VALUES_PORTRAIT_SECONDARY;
     } else if (strType == "landscape-primary") {
-      type = blink::WebScreenOrientationLandscapePrimary;
+      type = SCREEN_ORIENTATION_VALUES_LANDSCAPE_PRIMARY;
     } else if (strType == "landscape-secondary") {
-      type = blink::WebScreenOrientationLandscapeSecondary;
+      type = SCREEN_ORIENTATION_VALUES_LANDSCAPE_SECONDARY;
     }
-    ASSERT_NE(blink::WebScreenOrientationUndefined, type);
-    screen_info.orientationType = type;
+    ASSERT_NE(SCREEN_ORIENTATION_VALUES_DEFAULT, type);
+    screen_info.orientation_type = type;
 
     ResizeParams params;
     params.screen_info = screen_info;