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

Unified Diff: chrome/browser/apps/speech_recognition_browsertest.cc

Issue 24292004: Allow webkitSpeechRecognition work from an app's background page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use FakeSpeechRecognitionManager for first test to pass on bots. Created 7 years, 3 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 | « no previous file | chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/apps/speech_recognition_browsertest.cc
diff --git a/chrome/browser/apps/speech_recognition_browsertest.cc b/chrome/browser/apps/speech_recognition_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fbfdc6d74fa1fc43d8b4e7955cd56f9803ec7b07
--- /dev/null
+++ b/chrome/browser/apps/speech_recognition_browsertest.cc
@@ -0,0 +1,49 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/apps/app_browsertest_util.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/test/fake_speech_recognition_manager.h"
+
+class SpeechRecognitionTest : public extensions::PlatformAppBrowserTest {
+ protected:
+ virtual void SetUp() OVERRIDE {
+ const testing::TestInfo* const test_info =
+ testing::UnitTest::GetInstance()->current_test_info();
+ // For SpeechRecognitionTest.SpeechFromBackgroundPage test, we need to
+ // fake the speech input to make tests run OK in bots.
+ if (!strcmp(test_info->name(), "SpeechFromBackgroundPage")) {
+ fake_speech_recognition_manager_.reset(
+ new content::FakeSpeechRecognitionManager());
+ fake_speech_recognition_manager_->set_should_send_fake_response(true);
+ // Inject the fake manager factory so that the test result is returned to
+ // the web page.
+ content::SpeechRecognitionManager::SetManagerForTests(
+ fake_speech_recognition_manager_.get());
+ }
+
+ extensions::PlatformAppBrowserTest::SetUp();
+ }
+
+ virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
+ command_line->AppendSwitch(switches::kUseFakeUIForMediaStream);
+ extensions::PlatformAppBrowserTest::SetUpCommandLine(command_line);
+ }
+ private:
tapted 2013/09/24 02:53:41 nit: blank line before
lazyboy 2013/09/24 07:03:54 Done.
+ scoped_ptr<content::FakeSpeechRecognitionManager>
+ fake_speech_recognition_manager_;
+};
tapted 2013/09/24 02:53:41 nit: DISALLOW_COPY_AND_ASSIGN(..)
lazyboy 2013/09/24 07:03:54 Done.
+
+IN_PROC_BROWSER_TEST_F(SpeechRecognitionTest, SpeechFromBackgroundPage) {
+ ASSERT_TRUE(RunPlatformAppTest("platform_apps/speech/background_page"))
+ << message_;
+}
+
+IN_PROC_BROWSER_TEST_F(SpeechRecognitionTest,
+ SpeechFromBackgroundPageWithoutPermission) {
+ ASSERT_TRUE(
+ RunPlatformAppTest("platform_apps/speech/background_page_no_permission"))
+ << message_;
+}
« no previous file with comments | « no previous file | chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698