Revert 56006 - Revert 56002 - Adds SpeechInputManagerImpl to handle requests ...

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/utf_string_conversions.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/speech/speech_input_dispatcher_host.h"
 #include "chrome/browser/speech/speech_input_manager.h"
@@ skipping 11 matching lines @@
 // Disabling refcounting here saves a bit of unnecessary code and the factory
 // method can return a plain pointer below as required by the real code.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(speech_input::FakeSpeechInputManager);
 
 namespace speech_input {
 
 const char* kTestResult = "Pictures of the moon";
 
 class FakeSpeechInputManager : public SpeechInputManager {
  public:
-  explicit FakeSpeechInputManager(Listener* listener)
+  explicit FakeSpeechInputManager(Delegate* delegate)
       : render_view_id_(0),
-        listener_(listener) {
+        delegate_(delegate) {
   }
 
   // SpeechInputManager methods.
   void StartRecognition(int render_view_id) {
     EXPECT_EQ(0, render_view_id_);
     render_view_id_ = render_view_id;
     // Give the fake result in a short while.
     MessageLoop::current()->PostTask(FROM_HERE, NewRunnableMethod(this,
         &FakeSpeechInputManager::SetFakeRecognitionResult));
   }
   void CancelRecognition(int render_view_id) {
     EXPECT_EQ(render_view_id_, render_view_id);
     render_view_id_ = 0;
   }
   void StopRecording(int render_view_id) {
     EXPECT_EQ(render_view_id_, render_view_id);
     // Nothing to do here since we aren't really recording.
   }
 
  private:
   void SetFakeRecognitionResult() {
     if (render_view_id_) {  // Do a check in case we were cancelled..
-      listener_->DidCompleteRecording(render_view_id_);
-      listener_->SetRecognitionResult(render_view_id_,
+      delegate_->DidCompleteRecording(render_view_id_);
+      delegate_->SetRecognitionResult(render_view_id_,
                                       ASCIIToUTF16(kTestResult));
-      listener_->DidCompleteRecognition(render_view_id_);
+      delegate_->DidCompleteRecognition(render_view_id_);
       render_view_id_ = 0;
     }
   }
 
   int render_view_id_;
-  Listener* listener_;
+  Delegate* delegate_;
 };
 
 // Factory method.
-SpeechInputManager* fakeManagerFactory(SpeechInputManager::Listener* listener) {
-  return new FakeSpeechInputManager(listener);
+SpeechInputManager* fakeManagerFactory(SpeechInputManager::Delegate* delegate) {
+  return new FakeSpeechInputManager(delegate);
 }
 
 class SpeechInputBrowserTest : public InProcessBrowserTest {
  public:
   // InProcessBrowserTest methods
   virtual void SetUpCommandLine(CommandLine* command_line) {
     command_line->AppendSwitch(switches::kEnableSpeechInput);
   }
 
   GURL testUrl(const FilePath::CharType* filename) {
@@ skipping 13 matching lines @@
   GURL test_url = testUrl(FILE_PATH_LITERAL("basic_recognition.html"));
   ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(),
                                                             test_url,
                                                             2);
 
   // Check that the page got the result it expected.
   EXPECT_EQ("pass", browser()->GetSelectedTabContents()->GetURL().ref());
 }
 
 } //  namespace speech_input