Revert of [screen-orientation] Update implementation to match recent spec changes.

LayoutTests/screen_orientation/orientationchange-event.html

Index: LayoutTests/screen_orientation/orientationchange-event.html
diff --git a/LayoutTests/screen_orientation/orientationchange-event.html b/LayoutTests/screen_orientation/orientationchange-event.html
index 8b714bd4402c3f56d72029a2fe540f2fca8ab067..54d387f6bafd57bba3d049a38888268b11bfade6 100644
--- a/LayoutTests/screen_orientation/orientationchange-event.html
+++ b/LayoutTests/screen_orientation/orientationchange-event.html
@@ -12,21 +12,28 @@
   'landscape-secondary'
 ];
 
-var currentIndex = orientations.indexOf(window.screen.orientation.type);
-// Count the number of calls received from the EventHandler set on screen.orientation.onchange.
+var currentIndex = orientations.indexOf(window.screen.orientation);
+// Count the number of calls received from the EventHandler set on window.onorientationchange.
 var orientationChangeEventHandlerCalls = 0;
-// Count the number of calls received from the listener set with screen.orientation.addEventListene().
+// Count the number of calls received from the listener set with window.addEventListene().
 var orientationChangeEventListenerCalls = 0;
+
+// TODO: window.onorientationchange is enabled on Android only. We will enable
+// it with ScreenOrientation later, at which point this test will fail. We will
+// then have to fix it.
+function todo_equals(actual, expected) {
+  assert_not_equals(actual, expected, "TODO: if this fails, it means that something got fixed.");
+}
 
 function getNextIndex() {
   return (currentIndex + 1) % orientations.length;
 }
 
-window.screen.orientation.onchange = function() {
+window.onorientationchange = function() {
   orientationChangeEventHandlerCalls++;
 };
 
-window.screen.orientation.addEventListener('change', function() {
+window.addEventListener('orientationchange', function() {
   orientationChangeEventListenerCalls++;
 });
 
@@ -35,18 +42,18 @@
     window.testRunner.setMockScreenOrientation(orientations[getNextIndex()]);
 
     currentIndex = getNextIndex();
-    assert_equals(screen.orientation.type, orientations[currentIndex]);
+    assert_equals(screen.orientation, orientations[currentIndex]);
 
-    assert_equals(orientationChangeEventHandlerCalls, i + 1);
+    todo_equals(orientationChangeEventHandlerCalls, i + 1);
     assert_equals(orientationChangeEventListenerCalls, i + 1);
   }, "Test that orientationchange event is fired when the orientation changes");
 }
 
 test(function() {
   window.testRunner.setMockScreenOrientation(orientations[currentIndex]);
-  assert_equals(screen.orientation.type, orientations[currentIndex]);
+  assert_equals(screen.orientation, orientations[currentIndex]);
 
-  assert_equals(orientationChangeEventHandlerCalls, 4);
+  todo_equals(orientationChangeEventHandlerCalls, 4);
   assert_equals(orientationChangeEventListenerCalls, 4);
 }, "Test that orientationchange event is not fired when the orientation does not change");