Revert r70896 to move speech input back behind a flag.

chrome/browser/speech/speech_input_browsertest.cc

 // 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 "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/speech/speech_input_dispatcher_host.h"
@@ skipping 76 matching lines @@
   }
 
   int caller_id_;
   Delegate* delegate_;
   std::string grammar_;
 };
 
 class SpeechInputBrowserTest : public InProcessBrowserTest {
  public:
   // InProcessBrowserTest methods
-  virtual void SetUpCommandLine(CommandLine* command_line) {
-    EXPECT_TRUE(!command_line->HasSwitch(switches::kDisableSpeechInput));
-  }
-
   GURL testUrl(const FilePath::CharType* filename) {
     const FilePath kTestDir(FILE_PATH_LITERAL("speech"));
     return ui_test_utils::GetTestUrl(kTestDir, FilePath(filename));
   }
 
  protected:
   void LoadAndRunSpeechInputTest(const FilePath::CharType* filename) {
     // The test page calculates the speech button's coordinate in the page on
     // load & sets that coordinate in the URL fragment. We send mouse down & up
     // events at that coordinate to trigger speech recognition.
@@ skipping 75 matching lines @@
 #else
 #define MAYBE_GrammarAttribute GrammarAttribute
 #endif
 IN_PROC_BROWSER_TEST_F(SpeechInputBrowserTest, MAYBE_GrammarAttribute) {
   LoadAndRunSpeechInputTest(FILE_PATH_LITERAL("grammar_attribute.html"));
   EXPECT_EQ("http://example.com/grammar.xml",
             fake_speech_input_manager_.grammar());
 }
 
 }  // namespace speech_input