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

Side by Side Diff: chrome/browser/speech/extension_api/tts_extension_apitest.cc

Issue 1143343005: chrome/browser: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 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 <vector> 5 #include <vector>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h"
9 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
10 #include "base/message_loop/message_loop.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/thread_task_runner_handle.h"
11 #include "chrome/browser/extensions/component_loader.h" 13 #include "chrome/browser/extensions/component_loader.h"
12 #include "chrome/browser/extensions/extension_apitest.h" 14 #include "chrome/browser/extensions/extension_apitest.h"
13 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/speech/extension_api/tts_extension_api.h" 16 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
15 #include "chrome/browser/speech/tts_controller.h" 17 #include "chrome/browser/speech/tts_controller.h"
16 #include "chrome/browser/speech/tts_platform.h" 18 #include "chrome/browser/speech/tts_platform.h"
17 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
18 #include "extensions/browser/extension_system.h" 20 #include "extensions/browser/extension_system.h"
19 #include "net/base/network_change_notifier.h" 21 #include "net/base/network_change_notifier.h"
20 #include "testing/gmock/include/gmock/gmock.h" 22 #include "testing/gmock/include/gmock/gmock.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 voices->push_back(voice); 83 voices->push_back(voice);
82 } 84 }
83 85
84 void set_should_fake_get_voices(bool val) { should_fake_get_voices_ = val; } 86 void set_should_fake_get_voices(bool val) { should_fake_get_voices_ = val; }
85 87
86 void SetErrorToEpicFail() { 88 void SetErrorToEpicFail() {
87 set_error("epic fail"); 89 set_error("epic fail");
88 } 90 }
89 91
90 void SendEndEventOnSavedUtteranceId() { 92 void SendEndEventOnSavedUtteranceId() {
91 base::MessageLoop::current()->PostDelayedTask( 93 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
92 FROM_HERE, base::Bind( 94 FROM_HERE,
93 &MockTtsPlatformImpl::SendEvent, 95 base::Bind(&MockTtsPlatformImpl::SendEvent, ptr_factory_.GetWeakPtr(),
94 ptr_factory_.GetWeakPtr(), 96 false, g_saved_utterance_id, TTS_EVENT_END, 0,
95 false, g_saved_utterance_id, TTS_EVENT_END, 0, std::string()), 97 std::string()),
96 base::TimeDelta()); 98 base::TimeDelta());
97 } 99 }
98 100
99 void SendEndEvent(int utterance_id, 101 void SendEndEvent(int utterance_id,
100 const std::string& utterance, 102 const std::string& utterance,
101 const std::string& lang, 103 const std::string& lang,
102 const VoiceData& voice, 104 const VoiceData& voice,
103 const UtteranceContinuousParameters& params) { 105 const UtteranceContinuousParameters& params) {
104 base::MessageLoop::current()->PostDelayedTask( 106 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
105 FROM_HERE, base::Bind( 107 FROM_HERE, base::Bind(&MockTtsPlatformImpl::SendEvent,
106 &MockTtsPlatformImpl::SendEvent, 108 ptr_factory_.GetWeakPtr(), false, utterance_id,
107 ptr_factory_.GetWeakPtr(), 109 TTS_EVENT_END, utterance.size(), std::string()),
108 false, utterance_id, TTS_EVENT_END, utterance.size(),
109 std::string()),
110 base::TimeDelta()); 110 base::TimeDelta());
111 } 111 }
112 112
113 void SendEndEventWhenQueueNotEmpty( 113 void SendEndEventWhenQueueNotEmpty(
114 int utterance_id, 114 int utterance_id,
115 const std::string& utterance, 115 const std::string& utterance,
116 const std::string& lang, 116 const std::string& lang,
117 const VoiceData& voice, 117 const VoiceData& voice,
118 const UtteranceContinuousParameters& params) { 118 const UtteranceContinuousParameters& params) {
119 base::MessageLoop::current()->PostDelayedTask( 119 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
120 FROM_HERE, base::Bind( 120 FROM_HERE, base::Bind(&MockTtsPlatformImpl::SendEvent,
121 &MockTtsPlatformImpl::SendEvent, 121 ptr_factory_.GetWeakPtr(), true, utterance_id,
122 ptr_factory_.GetWeakPtr(), 122 TTS_EVENT_END, utterance.size(), std::string()),
123 true, utterance_id, TTS_EVENT_END, utterance.size(), std::string()),
124 base::TimeDelta()); 123 base::TimeDelta());
125 } 124 }
126 125
127 void SendWordEvents(int utterance_id, 126 void SendWordEvents(int utterance_id,
128 const std::string& utterance, 127 const std::string& utterance,
129 const std::string& lang, 128 const std::string& lang,
130 const VoiceData& voice, 129 const VoiceData& voice,
131 const UtteranceContinuousParameters& params) { 130 const UtteranceContinuousParameters& params) {
132 for (int i = 0; i < static_cast<int>(utterance.size()); i++) { 131 for (int i = 0; i < static_cast<int>(utterance.size()); i++) {
133 if (i == 0 || utterance[i - 1] == ' ') { 132 if (i == 0 || utterance[i - 1] == ' ') {
134 base::MessageLoop::current()->PostDelayedTask( 133 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
135 FROM_HERE, base::Bind( 134 FROM_HERE,
136 &MockTtsPlatformImpl::SendEvent, 135 base::Bind(&MockTtsPlatformImpl::SendEvent,
137 ptr_factory_.GetWeakPtr(), 136 ptr_factory_.GetWeakPtr(), false, utterance_id,
138 false, utterance_id, TTS_EVENT_WORD, i, 137 TTS_EVENT_WORD, i, std::string()),
139 std::string()),
140 base::TimeDelta()); 138 base::TimeDelta());
141 } 139 }
142 } 140 }
143 } 141 }
144 142
145 void SendEvent(bool wait_for_non_empty_queue, 143 void SendEvent(bool wait_for_non_empty_queue,
146 int utterance_id, 144 int utterance_id,
147 TtsEventType event_type, 145 TtsEventType event_type,
148 int char_index, 146 int char_index,
149 const std::string& message) { 147 const std::string& message) {
150 TtsController* controller = TtsController::GetInstance(); 148 TtsController* controller = TtsController::GetInstance();
151 if (wait_for_non_empty_queue && controller->QueueSize() == 0) { 149 if (wait_for_non_empty_queue && controller->QueueSize() == 0) {
152 base::MessageLoop::current()->PostDelayedTask( 150 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
153 FROM_HERE, base::Bind( 151 FROM_HERE,
154 &MockTtsPlatformImpl::SendEvent, 152 base::Bind(&MockTtsPlatformImpl::SendEvent, ptr_factory_.GetWeakPtr(),
155 ptr_factory_.GetWeakPtr(), 153 true, utterance_id, event_type, char_index, message),
156 true, utterance_id, event_type, char_index, message),
157 base::TimeDelta::FromMilliseconds(100)); 154 base::TimeDelta::FromMilliseconds(100));
158 return; 155 return;
159 } 156 }
160 157
161 controller->OnTtsEvent(utterance_id, event_type, char_index, message); 158 controller->OnTtsEvent(utterance_id, event_type, char_index, message);
162 } 159 }
163 160
164 private: 161 private:
165 bool should_fake_get_voices_; 162 bool should_fake_get_voices_;
166 base::WeakPtrFactory<MockTtsPlatformImpl> ptr_factory_; 163 base::WeakPtrFactory<MockTtsPlatformImpl> ptr_factory_;
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 // Test should fail when offline. 444 // Test should fail when offline.
448 ASSERT_FALSE(RunExtensionTest("tts_engine/network_speech_engine")); 445 ASSERT_FALSE(RunExtensionTest("tts_engine/network_speech_engine"));
449 } 446 }
450 447
451 // http://crbug.com/122474 448 // http://crbug.com/122474
452 IN_PROC_BROWSER_TEST_F(TtsApiTest, EngineApi) { 449 IN_PROC_BROWSER_TEST_F(TtsApiTest, EngineApi) {
453 ASSERT_TRUE(RunExtensionTest("tts_engine/engine_api")) << message_; 450 ASSERT_TRUE(RunExtensionTest("tts_engine/engine_api")) << message_;
454 } 451 }
455 452
456 } // namespace extensions 453 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/signin/fake_profile_oauth2_token_service.cc ('k') | chrome/browser/spellchecker/feedback_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698