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

Source/modules/screen_orientation/ScreenOrientationController.h

Index: Source/modules/screen_orientation/ScreenOrientationController.h
diff --git a/Source/modules/screen_orientation/ScreenOrientationController.h b/Source/modules/screen_orientation/ScreenOrientationController.h
index 7bbefe9ab30b7fac83c2052d65dfba009eea3f09..71bc9546996c620cf14674765044d75ad15e1e8e 100644
--- a/Source/modules/screen_orientation/ScreenOrientationController.h
+++ b/Source/modules/screen_orientation/ScreenOrientationController.h
@@ -18,12 +18,8 @@
 namespace WebCore {
 
 class FrameView;
-class ScreenOrientation;
 
-class ScreenOrientationController FINAL :
-    public NoBaseWillBeGarbageCollectedFinalized<ScreenOrientationController>,
-    public WillBeHeapSupplement<LocalFrame>,
-    public PageLifecycleObserver {
+class ScreenOrientationController FINAL : public NoBaseWillBeGarbageCollectedFinalized<ScreenOrientationController>, public WillBeHeapSupplement<LocalFrame>, public PageLifecycleObserver {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(ScreenOrientationController);
     WTF_MAKE_NONCOPYABLE(ScreenOrientationController);
 public:
@@ -31,19 +27,14 @@
 
     virtual void persistentHostHasBeenDestroyed() OVERRIDE;
 
-    void setOrientation(ScreenOrientation*);
-    void notifyOrientationChanged();
-
-    void lock(blink::WebScreenOrientationLockType, blink::WebLockOrientationCallback*);
-    void unlock();
-
-    const LocalFrame& frame() const;
+    blink::WebScreenOrientationType orientation() const;
 
     static void provideTo(LocalFrame&, blink::WebScreenOrientationClient*);
-    static ScreenOrientationController* from(LocalFrame&);
+    static ScreenOrientationController& from(LocalFrame&);
     static const char* supplementName();
 
-    virtual void trace(Visitor*);
+    void lockOrientation(blink::WebScreenOrientationLockType, blink::WebLockOrientationCallback*);
+    void unlockOrientation();
 
 private:
     explicit ScreenOrientationController(LocalFrame&, blink::WebScreenOrientationClient*);
@@ -52,9 +43,7 @@
     // Inherited from PageLifecycleObserver.
     virtual void pageVisibilityChanged() OVERRIDE;
 
-    void updateOrientation();
-
-    PersistentWillBeMember<ScreenOrientation> m_orientation;
+    blink::WebScreenOrientationType m_overrideOrientation;
     blink::WebScreenOrientationClient* m_client;
     LocalFrame& m_frame;
 };