Use a new Supplement constructor in ScreenOrientationController

We're deprecating the default constructor of Supplement.

This CL also moves GarbageCollectedFinalized up to ScreenOrientationController.

BUG=610176

Review-Url: https://codereview.chromium.org/2625043002
Cr-Commit-Position: refs/heads/master@{#442892}

third_party/WebKit/Source/core/frame/ScreenOrientationController.cpp

@@ -6,6 +6,9 @@
 
 namespace blink {
 
+ScreenOrientationController::ScreenOrientationController(LocalFrame& frame)
+    : Supplement<LocalFrame>(frame) {}
+
 // static
 ScreenOrientationController* ScreenOrientationController::from(
     LocalFrame& frame) {

third_party/WebKit/Source/core/frame/ScreenOrientationController.h

@@ -19,7 +19,11 @@ class WebLockOrientationCallback;
 // module will implement and add a provider for.
 // Callers of ScreenOrientationController::from() should always assume the
 // returned pointer can be nullptr.
-class CORE_EXPORT ScreenOrientationController : public Supplement<LocalFrame> {
+class CORE_EXPORT ScreenOrientationController
+    : public GarbageCollectedFinalized<ScreenOrientationController>,
+      public Supplement<LocalFrame> {
+  USING_GARBAGE_COLLECTED_MIXIN(ScreenOrientationController);
+
  public:
   virtual ~ScreenOrientationController() = default;
 
@@ -38,6 +42,7 @@ class CORE_EXPORT ScreenOrientationController : public Supplement<LocalFrame> {
   DECLARE_VIRTUAL_TRACE();
 
  protected:
+  explicit ScreenOrientationController(LocalFrame&);
   // To be called by an ScreenOrientationController to register its
   // implementation.
   static void provideTo(LocalFrame&, ScreenOrientationController*);

third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegateTest.cpp

@@ -92,15 +92,13 @@ class StubFrameLoaderClient : public EmptyFrameLoaderClient {
 };
 
 class MockScreenOrientationController final
-    : public GarbageCollectedFinalized<MockScreenOrientationController>,
-      public ScreenOrientationController {
-  USING_GARBAGE_COLLECTED_MIXIN(MockScreenOrientationController);
+    : public ScreenOrientationController {
   WTF_MAKE_NONCOPYABLE(MockScreenOrientationController);
 
  public:
   static MockScreenOrientationController* provideTo(LocalFrame& frame) {
     MockScreenOrientationController* controller =
-        new MockScreenOrientationController();
+        new MockScreenOrientationController(frame);
     ScreenOrientationController::provideTo(frame, controller);
     return controller;
   }
@@ -108,10 +106,11 @@ class MockScreenOrientationController final
   MOCK_METHOD1(lock, void(WebScreenOrientationLockType));
   MOCK_METHOD0(mockUnlock, void());
 
-  DEFINE_INLINE_VIRTUAL_TRACE() { Supplement<LocalFrame>::trace(visitor); }
+  DEFINE_INLINE_VIRTUAL_TRACE() { ScreenOrientationController::trace(visitor); }
 
  private:
-  MockScreenOrientationController() = default;
+  explicit MockScreenOrientationController(LocalFrame& frame)
+      : ScreenOrientationController(frame) {}
 
   void lock(WebScreenOrientationLockType type,
             std::unique_ptr<WebLockOrientationCallback>) override {

third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationControllerImpl.cpp

@@ -40,7 +40,8 @@ ScreenOrientationControllerImpl* ScreenOrientationControllerImpl::from(
 ScreenOrientationControllerImpl::ScreenOrientationControllerImpl(
     LocalFrame& frame,
     WebScreenOrientationClient* client)
-    : ContextLifecycleObserver(frame.document()),
+    : ScreenOrientationController(frame),
+      ContextLifecycleObserver(frame.document()),
       PlatformEventController(frame.page()),
       m_client(client),
       m_dispatchEventTimer(

third_party/WebKit/Source/modules/screen_orientation/ScreenOrientationControllerImpl.h

@@ -21,8 +21,7 @@ class ScreenOrientation;
 class WebScreenOrientationClient;
 
 class MODULES_EXPORT ScreenOrientationControllerImpl final
-    : public GarbageCollectedFinalized<ScreenOrientationControllerImpl>,
-      public ScreenOrientationController,
+    : public ScreenOrientationController,
       public ContextLifecycleObserver,
       public PlatformEventController {
   USING_GARBAGE_COLLECTED_MIXIN(ScreenOrientationControllerImpl);