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

third_party/WebKit/Source/devtools/protocol.json

Index: third_party/WebKit/Source/devtools/protocol.json
diff --git a/third_party/WebKit/Source/devtools/protocol.json b/third_party/WebKit/Source/devtools/protocol.json
index 702d62c7a679775b858c8dbb0a6a536aacf8e767..1baa4757f749f9cba996c8802c95707ab417a87a 100644
--- a/third_party/WebKit/Source/devtools/protocol.json
+++ b/third_party/WebKit/Source/devtools/protocol.json
@@ -337,8 +337,7 @@
                     { "name": "screenWidth", "type": "integer", "optional": true, "description": "Overriding screen width value in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
                     { "name": "screenHeight", "type": "integer", "optional": true, "description": "Overriding screen height value in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
                     { "name": "positionX", "type": "integer", "optional": true, "description": "Overriding view X position on screen in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
-                    { "name": "positionY", "type": "integer", "optional": true, "description": "Overriding view Y position on screen in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
-                    { "name": "screenOrientation", "$ref": "Emulation.ScreenOrientation", "optional": true, "description": "Screen orientation override." }
+                    { "name": "positionY", "type": "integer", "optional": true, "description": "Overriding view Y position on screen in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." }
                 ],
                 "handlers": ["browser"],
                 "redirect": "Emulation",
@@ -642,17 +641,6 @@
         "domain": "Emulation",
         "description": "This domain emulates different environments for the page.",
         "hidden": true,
-        "types": [
-            {
-                "id": "ScreenOrientation",
-                "type": "object",
-                "description": "Screen orientation.",
-                "properties": [
-                    { "name": "type",  "type": "string", "enum": ["portraitPrimary", "portraitSecondary", "landscapePrimary", "landscapeSecondary"], "description": "Orientation type." },
-                    { "name": "angle",  "type": "integer", "description": "Orientation angle." }
-                ]
-            }
-        ],
         "commands": [
             {
                 "name": "setDeviceMetricsOverride",
@@ -669,8 +657,7 @@
                     { "name": "screenWidth", "type": "integer", "optional": true, "description": "Overriding screen width value in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
                     { "name": "screenHeight", "type": "integer", "optional": true, "description": "Overriding screen height value in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
                     { "name": "positionX", "type": "integer", "optional": true, "description": "Overriding view X position on screen in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
-                    { "name": "positionY", "type": "integer", "optional": true, "description": "Overriding view Y position on screen in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." },
-                    { "name": "screenOrientation", "$ref": "ScreenOrientation", "optional": true, "description": "Screen orientation override." }
+                    { "name": "positionY", "type": "integer", "optional": true, "description": "Overriding view Y position on screen in pixels (minimum 0, maximum 10000000). Only used for |mobile==true|." }
                 ],
                 "handlers": ["browser"]
             },
@@ -4926,6 +4913,32 @@
         ]
     },
     {
+        "domain": "ScreenOrientation",
+        "hidden": true,
+        "types": [
+            {
+                "id": "OrientationType",
+                "type": "string",
+                "enum": ["portraitPrimary", "portraitSecondary", "landscapePrimary", "landscapeSecondary"],
+                "description": "Orientation type"
+            }
+        ],
+        "commands": [
+            {
+                "name": "setScreenOrientationOverride",
+                "description": "Overrides the Screen Orientation.",
+                "parameters": [
+                    { "name": "angle", "type": "integer", "description": "Orientation angle" },
+                    { "name": "type", "$ref": "OrientationType", "description": "Orientation type" }
+                ]
+            },
+            {
+                "name": "clearScreenOrientationOverride",
+                "description": "Clears the overridden Screen Orientation."
+            }
+        ]
+    },
+    {
         "domain": "Tracing",
         "commands": [
             {