summaryrefslogtreecommitdiffstats
path: root/chrome/browser/speech
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 20:46:38 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-01 20:46:38 +0000
commite326bb9ab32dea06c9419ee774a9a893fb02da52 (patch)
tree99a16786493a64b868a4dd81ceaff83961b44a11 /chrome/browser/speech
parent9a2f1db004542314746b2f21839964d8a9b4a122 (diff)
downloadchromium_src-e326bb9ab32dea06c9419ee774a9a893fb02da52.zip
chromium_src-e326bb9ab32dea06c9419ee774a9a893fb02da52.tar.gz
chromium_src-e326bb9ab32dea06c9419ee774a9a893fb02da52.tar.bz2
Enable the html speech input API for all platforms.
Also removes the '--enable-input-speech' flag and associated browser test as they are no longer required. BUG=53598 TEST=browser_tests --gtest_filter="SpeechInputBrowserTest.*" Review URL: http://codereview.chromium.org/3550003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61227 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/speech')
-rw-r--r--chrome/browser/speech/enable_speech_input_switch_browsertest.cc42
1 files changed, 0 insertions, 42 deletions
diff --git a/chrome/browser/speech/enable_speech_input_switch_browsertest.cc b/chrome/browser/speech/enable_speech_input_switch_browsertest.cc
deleted file mode 100644
index d67a0f4..0000000
--- a/chrome/browser/speech/enable_speech_input_switch_browsertest.cc
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) 2010 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 "base/command_line.h"
-#include "base/file_path.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
-
-class SpeechInputEnableSwitchTest : public InProcessBrowserTest {
- public:
- GURL testUrl(const FilePath::CharType* filename) {
- const FilePath kTestDir(FILE_PATH_LITERAL("speech"));
- return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
- }
-};
-
-// Speech input is enabled by default in windows, linux & mac builds for the
-// next dev channel build, after which we'll remove this check and keep it
-// disabled.
-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX)
-
-IN_PROC_BROWSER_TEST_F(SpeechInputEnableSwitchTest, UnavailabilityTest) {
- // Test that speech input is not available to a web page if
- // the runtime switch is disabled.
-
- const CommandLine& command_line = *CommandLine::ForCurrentProcess();
- bool has_switch = command_line.HasSwitch(switches::kEnableSpeechInput);
- ASSERT_FALSE(has_switch) << "This test does not make sense if "
- << "--enable-speech-input is set.";
-
- GURL test_url = testUrl(
- FILE_PATH_LITERAL("enable_speech_input_switch_test.html"));
- ui_test_utils::NavigateToURL(browser(), test_url);
- std::string status = browser()->GetSelectedTabContents()->GetURL().ref();
- EXPECT_EQ("pass", status) << "Page detected speech input properties.";
-}
-
-#endif