Use a new Supplement constructor in ScreenOrientationController

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

Index: third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegateTest.cpp
diff --git a/third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegateTest.cpp b/third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegateTest.cpp
index 6a80ef90e209c41bb07198e5001ca80322e2d81b..ad490be64e76657f9d37e70c51234d098adf2dd2 100644
--- a/third_party/WebKit/Source/core/html/shadow/MediaControlsOrientationLockDelegateTest.cpp
+++ b/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 {