Use a new Supplement constructor in ScreenOrientationController

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

 // Copyright 2016 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 "core/html/shadow/MediaControlsOrientationLockDelegate.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/DocumentUserGestureToken.h"
 #include "core/dom/Fullscreen.h"
 #include "core/frame/ScreenOrientationController.h"
@@ skipping 74 matching lines @@
 
   std::unique_ptr<WebMediaPlayer> createWebMediaPlayer(
       HTMLMediaElement&,
       const WebMediaPlayerSource&,
       WebMediaPlayerClient*) override {
     return WTF::wrapUnique(new MockVideoWebMediaPlayer());
   }
 };
 
 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;
   }
 
   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 {
     m_locked = true;
     lock(type);
   }
 
   void unlock() override {
     m_locked = false;
     mockUnlock();
@@ skipping 295 matching lines @@
   EXPECT_EQ(WebScreenOrientationLockLandscape, computeOrientationLock());
 
   screenInfo.orientationType = WebScreenOrientationLandscapeSecondary;
   EXPECT_CALL(chromeClient(), screenInfo())
       .Times(1)
       .WillOnce(Return(screenInfo));
   EXPECT_EQ(WebScreenOrientationLockLandscape, computeOrientationLock());
 }
 
 }  // namespace blink