| Index: content/public/common/media_stream_request.h
|
| diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
|
| index 7486fd59993feead3875e96dfa1944bfcc8cd2f6..9116548dd581ca8154c7148d6ef93fb29de04270 100644
|
| --- a/content/public/common/media_stream_request.h
|
| +++ b/content/public/common/media_stream_request.h
|
| @@ -8,11 +8,11 @@
|
| #include <stddef.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/callback_forward.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/common/content_export.h"
|
| #include "media/audio/audio_parameters.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| @@ -264,10 +264,10 @@ class MediaStreamUI {
|
| };
|
|
|
| // Callback used return results of media access requests.
|
| -typedef base::Callback<void(
|
| - const MediaStreamDevices& devices,
|
| - content::MediaStreamRequestResult result,
|
| - scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
|
| +typedef base::Callback<void(const MediaStreamDevices& devices,
|
| + content::MediaStreamRequestResult result,
|
| + std::unique_ptr<MediaStreamUI> ui)>
|
| + MediaResponseCallback;
|
|
|
| } // namespace content
|
|
|
|
|