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

Unified Diff: chrome/test/base/testing_profile.cc

Issue 9568002: Renamed speech input implementation from to speech_recognition_*. The namespace has been renamed fr… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased from master. Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/mock_content_browser_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 54d76056b68c56767ca5068dca533a47c6ebdc95..930fa98a86e2933de212629d3d6418e2b0d9cc37 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -36,7 +36,7 @@
#include "chrome/browser/search_engines/template_url_service.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/signin/token_service.h"
-#include "chrome/browser/speech/chrome_speech_input_preferences.h"
+#include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
#include "chrome/browser/sync/profile_sync_service_mock.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
#include "chrome/common/chrome_constants.h"
@@ -651,11 +651,13 @@ TestingProfile::GetGeolocationPermissionContext() {
return geolocation_permission_context_.get();
}
-content::SpeechInputPreferences* TestingProfile::GetSpeechInputPreferences() {
+content::SpeechRecognitionPreferences*
+ TestingProfile::GetSpeechRecognitionPreferences() {
#if defined(ENABLE_INPUT_SPEECH)
- if (!speech_input_preferences_.get())
- speech_input_preferences_ = new ChromeSpeechInputPreferences(GetPrefs());
- return speech_input_preferences_.get();
+ if (!speech_recognition_preferences_.get())
+ speech_recognition_preferences_ =
+ new ChromeSpeechRecognitionPreferences(GetPrefs());
+ return speech_recognition_preferences_.get();
#else
return NULL;
#endif
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/mock_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698