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

Unified Diff: content/browser/speech/speech_recognition_browsertest.cc

Issue 2832023002: Replace SetUpInProcessBrowserTestFixture/TearDownInProcessBrowserTestFixture usage in content with … (Closed)
Patch Set: Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/accessibility/cross_platform_accessibility_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/speech/speech_recognition_browsertest.cc
diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc
index d51fea6f7081df346d2f86a9eb4bb3610ca788cb..73c4cc064dac6a38026f35269c3e25679e8c958e 100644
--- a/content/browser/speech/speech_recognition_browsertest.cc
+++ b/content/browser/speech/speech_recognition_browsertest.cc
@@ -111,15 +111,13 @@ class SpeechRecognitionBrowserTest :
protected:
// ContentBrowserTest methods.
- void SetUpInProcessBrowserTestFixture() override {
+ void SetUpOnMainThread() override {
test_audio_input_controller_factory_.set_delegate(this);
media::AudioInputController::set_factory_for_testing(
&test_audio_input_controller_factory_);
mock_streaming_server_.reset(new MockGoogleStreamingServer(this));
streaming_server_state_ = kIdle;
- }
- void SetUpOnMainThread() override {
ASSERT_TRUE(SpeechRecognitionManagerImpl::GetInstance());
media::AudioManager::StartHangMonitorIfNeeded(
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO));
@@ -138,9 +136,7 @@ class SpeechRecognitionBrowserTest :
// Deleting AudioManager on audio thread,
audio_system_.reset();
audio_manager_.reset();
- }
- void TearDownInProcessBrowserTestFixture() override {
test_audio_input_controller_factory_.set_delegate(nullptr);
mock_streaming_server_.reset();
}
« no previous file with comments | « content/browser/accessibility/cross_platform_accessibility_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698