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

Unified Diff: chrome/browser/ui/app_list/speech_recognizer_browsertest.cc

Issue 797493002: Eliminate the launcher speech recognizer's dependency on the start page WebContents. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years 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
Index: chrome/browser/ui/app_list/speech_recognizer_browsertest.cc
diff --git a/chrome/browser/ui/app_list/speech_recognizer_browsertest.cc b/chrome/browser/ui/app_list/speech_recognizer_browsertest.cc
index 6af45899e65529e819ffb2e258f9dcb2820f81a5..94dae9a8177f32aafce75e35cef75af970a4785a 100644
--- a/chrome/browser/ui/app_list/speech_recognizer_browsertest.cc
+++ b/chrome/browser/ui/app_list/speech_recognizer_browsertest.cc
@@ -16,7 +16,6 @@
#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/test/fake_speech_recognition_manager.h"
-#include "content/public/test/web_contents_tester.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -36,7 +35,6 @@ class MockSpeechRecognizerDelegate : public SpeechRecognizerDelegate {
MOCK_METHOD2(OnSpeechResult, void(const base::string16&, bool));
MOCK_METHOD1(OnSpeechSoundLevelChanged, void(int16_t));
MOCK_METHOD1(OnSpeechRecognitionStateChanged, void(SpeechRecognitionState));
- MOCK_METHOD0(GetSpeechContents, content::WebContents*());
MOCK_METHOD2(GetSpeechAuthParameters, void(std::string*, std::string*));
private:
@@ -56,14 +54,9 @@ class AppListSpeechRecognizerBrowserTest : public InProcessBrowserTest {
content::SpeechRecognitionManager::SetManagerForTesting(
fake_speech_recognition_manager_.get());
mock_speech_delegate_.reset(new MockSpeechRecognizerDelegate());
- test_contents_.reset(content::WebContentsTester::CreateTestWebContents(
- browser()->profile(), NULL));
}
void TearDownOnMainThread() override {
- // This puts stuff on the IO loop which needs to be executed.
- test_contents_.reset();
-
// Poor-person's way of ensuring IO loop is idle.
auto io_loop = content::BrowserThread::UnsafeGetMessageLoopForThread(
content::BrowserThread::IO);
@@ -80,7 +73,6 @@ class AppListSpeechRecognizerBrowserTest : public InProcessBrowserTest {
scoped_ptr<content::FakeSpeechRecognitionManager>
fake_speech_recognition_manager_;
scoped_ptr<MockSpeechRecognizerDelegate> mock_speech_delegate_;
- scoped_ptr<content::WebContents> test_contents_;
private:
DISALLOW_COPY_AND_ASSIGN(AppListSpeechRecognizerBrowserTest);
@@ -92,8 +84,6 @@ IN_PROC_BROWSER_TEST_F(AppListSpeechRecognizerBrowserTest, RecognizeSpeech) {
"en");
base::RunLoop run_loop;
- EXPECT_CALL(*mock_speech_delegate_, GetSpeechContents())
- .WillOnce(Return(test_contents_.get()));
EXPECT_CALL(*mock_speech_delegate_,
OnSpeechResult(base::ASCIIToUTF16("Pictures of the moon"), true));
EXPECT_CALL(*mock_speech_delegate_,
« no previous file with comments | « chrome/browser/ui/app_list/speech_recognizer.cc ('k') | chrome/browser/ui/app_list/speech_recognizer_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698