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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/notifications/desktop_notification_service.h" 29 #include "chrome/browser/notifications/desktop_notification_service.h"
30 #include "chrome/browser/notifications/desktop_notification_service_factory.h" 30 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
31 #include "chrome/browser/prefs/browser_prefs.h" 31 #include "chrome/browser/prefs/browser_prefs.h"
32 #include "chrome/browser/prefs/testing_pref_store.h" 32 #include "chrome/browser/prefs/testing_pref_store.h"
33 #include "chrome/browser/prerender/prerender_manager.h" 33 #include "chrome/browser/prerender/prerender_manager.h"
34 #include "chrome/browser/profiles/profile_dependency_manager.h" 34 #include "chrome/browser/profiles/profile_dependency_manager.h"
35 #include "chrome/browser/search_engines/template_url_fetcher.h" 35 #include "chrome/browser/search_engines/template_url_fetcher.h"
36 #include "chrome/browser/search_engines/template_url_service.h" 36 #include "chrome/browser/search_engines/template_url_service.h"
37 #include "chrome/browser/search_engines/template_url_service_factory.h" 37 #include "chrome/browser/search_engines/template_url_service_factory.h"
38 #include "chrome/browser/signin/token_service.h" 38 #include "chrome/browser/signin/token_service.h"
39 #include "chrome/browser/speech/chrome_speech_input_preferences.h" 39 #include "chrome/browser/speech/chrome_speech_recognition_preferences.h"
40 #include "chrome/browser/sync/profile_sync_service_mock.h" 40 #include "chrome/browser/sync/profile_sync_service_mock.h"
41 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 41 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
42 #include "chrome/common/chrome_constants.h" 42 #include "chrome/common/chrome_constants.h"
43 #include "chrome/common/chrome_notification_types.h" 43 #include "chrome/common/chrome_notification_types.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #include "chrome/common/url_constants.h" 45 #include "chrome/common/url_constants.h"
46 #include "chrome/test/base/bookmark_load_observer.h" 46 #include "chrome/test/base/bookmark_load_observer.h"
47 #include "chrome/test/base/test_url_request_context_getter.h" 47 #include "chrome/test/base/test_url_request_context_getter.h"
48 #include "chrome/test/base/testing_pref_service.h" 48 #include "chrome/test/base/testing_pref_service.h"
49 #include "chrome/test/base/ui_test_utils.h" 49 #include "chrome/test/base/ui_test_utils.h"
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
643 643
644 content::GeolocationPermissionContext* 644 content::GeolocationPermissionContext*
645 TestingProfile::GetGeolocationPermissionContext() { 645 TestingProfile::GetGeolocationPermissionContext() {
646 if (!geolocation_permission_context_.get()) { 646 if (!geolocation_permission_context_.get()) {
647 geolocation_permission_context_ = 647 geolocation_permission_context_ =
648 new ChromeGeolocationPermissionContext(this); 648 new ChromeGeolocationPermissionContext(this);
649 } 649 }
650 return geolocation_permission_context_.get(); 650 return geolocation_permission_context_.get();
651 } 651 }
652 652
653 content::SpeechInputPreferences* TestingProfile::GetSpeechInputPreferences() { 653 content::SpeechRecognitionPreferences*
654 TestingProfile::GetSpeechRecognitionPreferences() {
654 #if defined(ENABLE_INPUT_SPEECH) 655 #if defined(ENABLE_INPUT_SPEECH)
655 if (!speech_input_preferences_.get()) 656 if (!speech_recognition_preferences_.get())
656 speech_input_preferences_ = new ChromeSpeechInputPreferences(GetPrefs()); 657 speech_recognition_preferences_ =
657 return speech_input_preferences_.get(); 658 new ChromeSpeechRecognitionPreferences(GetPrefs());
659 return speech_recognition_preferences_.get();
658 #else 660 #else
659 return NULL; 661 return NULL;
660 #endif 662 #endif
661 } 663 }
662 664
663 std::wstring TestingProfile::GetName() { 665 std::wstring TestingProfile::GetName() {
664 return std::wstring(); 666 return std::wstring();
665 } 667 }
666 668
667 std::wstring TestingProfile::GetID() { 669 std::wstring TestingProfile::GetID() {
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() { 761 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
760 return GetExtensionSpecialStoragePolicy(); 762 return GetExtensionSpecialStoragePolicy();
761 } 763 }
762 764
763 void TestingProfile::DestroyWebDataService() { 765 void TestingProfile::DestroyWebDataService() {
764 if (!web_data_service_.get()) 766 if (!web_data_service_.get())
765 return; 767 return;
766 768
767 web_data_service_->Shutdown(); 769 web_data_service_->Shutdown();
768 } 770 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698