Refactor lifetime management of UserMediaController

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

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 16 matching lines @@
 
 #include "core/frame/LocalFrame.h"
 #include "modules/mediastream/UserMediaClient.h"
 
 namespace blink {
 
 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*);
 
     void requestMediaDevices(MediaDevicesRequest*);
     void cancelMediaDevicesRequest(MediaDevicesRequest*);
 
     void requestSources(MediaStreamTrackSourcesRequest*);
 
     void setMediaDeviceChangeObserver(MediaDevices*);
 
     static const char* supplementName();
     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)
 {
     m_client->requestUserMedia(request);
 }
 
 inline void UserMediaController::cancelUserMediaRequest(UserMediaRequest* request)
 {
     m_client->cancelUserMediaRequest(request);
@@ skipping 15 matching lines @@
 }
 
 inline void UserMediaController::setMediaDeviceChangeObserver(MediaDevices* observer)
 {
     m_client->setMediaDeviceChangeObserver(observer);
 }
 
 } // namespace blink
 
 #endif // UserMediaController_h