Change blink::WebScreenInfo to content::ScreenInfo

content/browser/screen_orientation/screen_orientation_browsertest.cc

 // Copyright 2014 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 <stdlib.h>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #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 {
 
 class ScreenOrientationBrowserTest : public ContentBrowserTest  {
  public:
   ScreenOrientationBrowserTest() {
   }
 
  protected:
   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;
     params.new_size = gfx::Size(0, 0);
     params.physical_backing_size = gfx::Size(300, 300);
     params.top_controls_height = 0.f;
     params.top_controls_shrink_blink_size = false;
     params.resizer_rect = gfx::Rect();
     params.is_fullscreen_granted = false;
     rwh->Send(new ViewMsg_Resize(rwh->GetRoutingID(), params));
@@ skipping 178 matching lines @@
 
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
     navigation_observer.Wait();
     EXPECT_EQ("NotSupportedError",
               shell()->web_contents()->GetLastCommittedURL().ref());
   }
 }
 #endif // defined(OS_ANDROID)
 
 } // namespace content