Index: content/browser/speech/speech_recognizer_impl.h |
diff --git a/content/browser/speech/speech_recognizer_impl.h b/content/browser/speech/speech_recognizer_impl.h |
index 007142b92286f3f525a24f8e60d2bcacefdabdf3..074d48a9cc1a0b824ba1de907a3303b3b0eb1286 100644 |
--- a/content/browser/speech/speech_recognizer_impl.h |
+++ b/content/browser/speech/speech_recognizer_impl.h |
@@ -5,8 +5,9 @@ |
#ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_ |
#define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_IMPL_H_ |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "content/browser/speech/endpointer/endpointer.h" |
#include "content/browser/speech/speech_recognition_engine.h" |
#include "content/browser/speech/speech_recognizer.h" |
@@ -148,10 +149,10 @@ class CONTENT_EXPORT SpeechRecognizerImpl |
static media::AudioManager* audio_manager_for_tests_; |
- scoped_ptr<SpeechRecognitionEngine> recognition_engine_; |
+ std::unique_ptr<SpeechRecognitionEngine> recognition_engine_; |
Endpointer endpointer_; |
scoped_refptr<media::AudioInputController> audio_controller_; |
- scoped_ptr<media::AudioLog> audio_log_; |
+ std::unique_ptr<media::AudioLog> audio_log_; |
int num_samples_recorded_; |
float audio_level_; |
bool is_dispatching_event_; |
@@ -164,7 +165,7 @@ class CONTENT_EXPORT SpeechRecognizerImpl |
// Converts data between native input format and a WebSpeech specific |
// output format. |
- scoped_ptr<SpeechRecognizerImpl::OnDataConverter> audio_converter_; |
+ std::unique_ptr<SpeechRecognizerImpl::OnDataConverter> audio_converter_; |
DISALLOW_COPY_AND_ASSIGN(SpeechRecognizerImpl); |
}; |