Revert of [DevTools] Move screen orientation override to RenderWidgetScreenMetricsEmulator.

content/browser/devtools/protocol/emulation_handler.cc

 // Copyright 2015 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/browser/devtools/protocol/emulation_handler.h"
 
 #include <utility>
 
 #include "base/strings/string_number_conversions.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/geolocation/geolocation_service_context.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/url_constants.h"
 
 namespace content {
 namespace devtools {
 namespace emulation {
 
 using Response = DevToolsProtocolClient::Response;
 
 namespace {
 
-blink::WebScreenOrientationType WebScreenOrientationTypeFromString(
-    const std::string& type) {
-  if (type == screen_orientation::kTypePortraitPrimary)
-    return blink::WebScreenOrientationPortraitPrimary;
-  if (type == screen_orientation::kTypePortraitSecondary)
-    return blink::WebScreenOrientationPortraitSecondary;
-  if (type == screen_orientation::kTypeLandscapePrimary)
-    return blink::WebScreenOrientationLandscapePrimary;
-  if (type == screen_orientation::kTypeLandscapeSecondary)
-    return blink::WebScreenOrientationLandscapeSecondary;
-  return blink::WebScreenOrientationUndefined;
-}
-
 ui::GestureProviderConfigType TouchEmulationConfigurationToType(
     const std::string& protocol_value) {
   ui::GestureProviderConfigType result =
       ui::GestureProviderConfigType::CURRENT_PLATFORM;
   if (protocol_value ==
       set_touch_emulation_enabled::kConfigurationMobile) {
     result = ui::GestureProviderConfigType::GENERIC_MOBILE;
   }
   if (protocol_value ==
       set_touch_emulation_enabled::kConfigurationDesktop) {
@@ skipping 89 matching lines @@
     int height,
     double device_scale_factor,
     bool mobile,
     bool fit_window,
     const double* optional_scale,
     const double* optional_offset_x,
     const double* optional_offset_y,
     const int* screen_width,
     const int* screen_height,
     const int* position_x,
-    const int* position_y,
-    const scoped_ptr<base::DictionaryValue>& screen_orientation) {
+    const int* position_y) {
   const static int max_size = 10000000;
   const static double max_scale = 10;
-  const static int max_orientation_angle = 360;
 
   if (!host_)
     return Response::InternalError("Could not connect to view");
 
   if (screen_width && screen_height &&
       (*screen_width < 0 || *screen_height < 0 ||
            *screen_width > max_size || *screen_height > max_size)) {
     return Response::InvalidParams(
         "Screen width and height values must be positive, not greater than " +
         base::IntToString(max_size));
@@ skipping 13 matching lines @@
 
   if (device_scale_factor < 0)
     return Response::InvalidParams("deviceScaleFactor must be non-negative");
 
   if (optional_scale && (*optional_scale <= 0 || *optional_scale > max_scale)) {
     return Response::InvalidParams(
         "scale must be positive, not greater than " +
         base::DoubleToString(max_scale));
   }
 
-  blink::WebScreenOrientationType orientationType =
-      blink::WebScreenOrientationUndefined;
-  int orientationAngle = 0;
-  if (screen_orientation) {
-    std::string orientationTypeString;
-    if (!screen_orientation->GetString("type", &orientationTypeString)) {
-      return Response::InvalidParams(
-          "Screen orientation type must be a string");
-    }
-    orientationType = WebScreenOrientationTypeFromString(orientationTypeString);
-    if (orientationType == blink::WebScreenOrientationUndefined)
-      return Response::InvalidParams("Invalid screen orientation type value");
-
-    if (!screen_orientation->GetInteger("angle", &orientationAngle)) {
-      return Response::InvalidParams(
-          "Screen orientation angle must be a number");
-    }
-    if (orientationAngle < 0 || orientationAngle >= max_orientation_angle) {
-      return Response::InvalidParams(
-          "Screen orientation angle must be non-negative, less than " +
-          base::IntToString(max_orientation_angle));
-    }
-  }
-
   blink::WebDeviceEmulationParams params;
   params.screenPosition = mobile ? blink::WebDeviceEmulationParams::Mobile :
       blink::WebDeviceEmulationParams::Desktop;
   if (screen_width && screen_height)
     params.screenSize = blink::WebSize(*screen_width, *screen_height);
   if (position_x && position_y)
     params.viewPosition = blink::WebPoint(*position_x, *position_y);
   params.deviceScaleFactor = device_scale_factor;
   params.viewSize = blink::WebSize(width, height);
   params.fitToView = fit_window;
   params.scale = optional_scale ? *optional_scale : 1;
   params.offset = blink::WebFloatPoint(
       optional_offset_x ? *optional_offset_x : 0.f,
       optional_offset_y ? *optional_offset_y : 0.f);
-  params.screenOrientationType = orientationType;
-  params.screenOrientationAngle = orientationAngle;
 
   if (device_emulation_enabled_ && params == device_emulation_params_)
     return Response::OK();
 
   device_emulation_enabled_ = true;
   device_emulation_params_ = params;
   UpdateDeviceEmulationState();
   return Response::OK();
 }
 
@@ skipping 35 matching lines @@
         widget_host->GetRoutingID(), device_emulation_params_));
   } else {
     widget_host->Send(new ViewMsg_DisableDeviceEmulation(
         widget_host->GetRoutingID()));
   }
 }
 
 }  // namespace emulation
 }  // namespace devtools
 }  // namespace content