Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Side by Side Diff: media/audio/sounds/audio_stream_handler.h

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/simple_sources_unittest.cc ('k') | media/audio/sounds/audio_stream_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_ 5 #ifndef MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_
6 #define MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_ 6 #define MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory>
11
10 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/strings/string_piece.h" 14 #include "base/strings/string_piece.h"
13 #include "base/threading/non_thread_safe.h" 15 #include "base/threading/non_thread_safe.h"
14 #include "base/time/time.h" 16 #include "base/time/time.h"
15 #include "media/audio/audio_io.h" 17 #include "media/audio/audio_io.h"
16 #include "media/base/audio_parameters.h" 18 #include "media/base/audio_parameters.h"
17 #include "media/base/media_export.h" 19 #include "media/base/media_export.h"
18 20
19 namespace media { 21 namespace media {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 friend class AudioStreamHandlerTest; 64 friend class AudioStreamHandlerTest;
63 friend class SoundsManagerTest; 65 friend class SoundsManagerTest;
64 66
65 class AudioStreamContainer; 67 class AudioStreamContainer;
66 68
67 static void SetObserverForTesting(TestObserver* observer); 69 static void SetObserverForTesting(TestObserver* observer);
68 static void SetAudioSourceForTesting( 70 static void SetAudioSourceForTesting(
69 AudioOutputStream::AudioSourceCallback* source); 71 AudioOutputStream::AudioSourceCallback* source);
70 72
71 base::TimeDelta duration_; 73 base::TimeDelta duration_;
72 scoped_ptr<AudioStreamContainer> stream_; 74 std::unique_ptr<AudioStreamContainer> stream_;
73 75
74 DISALLOW_COPY_AND_ASSIGN(AudioStreamHandler); 76 DISALLOW_COPY_AND_ASSIGN(AudioStreamHandler);
75 }; 77 };
76 78
77 } // namespace media 79 } // namespace media
78 80
79 #endif // MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_ 81 #endif // MEDIA_AUDIO_SOUNDS_AUDIO_STREAM_HANDLER_H_
OLDNEW
« no previous file with comments | « media/audio/simple_sources_unittest.cc ('k') | media/audio/sounds/audio_stream_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698