Refactor lifetime management of UserMediaController

third_party/WebKit/Source/modules/mediastream/UserMediaController.h

Index: third_party/WebKit/Source/modules/mediastream/UserMediaController.h
diff --git a/third_party/WebKit/Source/modules/mediastream/UserMediaController.h b/third_party/WebKit/Source/modules/mediastream/UserMediaController.h
index d1858803a28aae3b677246684a1885b10bb20376..69b3e4109435bf014db82646c307805e585c59d4 100644
--- a/third_party/WebKit/Source/modules/mediastream/UserMediaController.h
+++ b/third_party/WebKit/Source/modules/mediastream/UserMediaController.h
@@ -34,14 +34,14 @@ class MediaDevices;
 class MediaDevicesRequest;
 class UserMediaRequest;
 
-class UserMediaController final : public GarbageCollected<UserMediaController>, public Supplement<LocalFrame> {
+class UserMediaController final : public GarbageCollectedFinalized<UserMediaController>, public Supplement<LocalFrame> {
     USING_GARBAGE_COLLECTED_MIXIN(UserMediaController);
 public:
-    static UserMediaController* create(UserMediaClient*);
+    static UserMediaController* create(std::unique_ptr<UserMediaClient>);
 
     DECLARE_VIRTUAL_TRACE();
 
-    UserMediaClient* client() const { return m_client; }
+    UserMediaClient* client() const { return m_client.get(); }
 
     void requestUserMedia(UserMediaRequest*);
     void cancelUserMediaRequest(UserMediaRequest*);
@@ -57,9 +57,9 @@ public:
     static UserMediaController* from(LocalFrame* frame) { return static_cast<UserMediaController*>(Supplement<LocalFrame>::from(frame, supplementName())); }
 
 private:
-    explicit UserMediaController(UserMediaClient*);
+    explicit UserMediaController(std::unique_ptr<UserMediaClient>);
 
-    UserMediaClient* m_client;
+    std::unique_ptr<UserMediaClient> m_client;
 };
 
 inline void UserMediaController::requestUserMedia(UserMediaRequest* request)