TestShell changes to support multiple speech input results.

webkit/tools/test_shell/layout_test_controller.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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
@@ skipping 189 matching lines @@
   BindMethod("forceRedSelectionColors", &LayoutTestController::forceRedSelectionColors);
   BindMethod("setEditingBehavior", &LayoutTestController::setEditingBehavior);
 
   BindMethod("setGeolocationPermission", &LayoutTestController::setGeolocationPermission);
   BindMethod("setMockGeolocationPosition", &LayoutTestController::setMockGeolocationPosition);
   BindMethod("setMockGeolocationError", &LayoutTestController::setMockGeolocationError);
 
   BindMethod("markerTextForListItem", &LayoutTestController::markerTextForListItem);
 
   BindMethod("setMockDeviceOrientation", &LayoutTestController::setMockDeviceOrientation);
-  BindMethod("setMockSpeechInputResult", &LayoutTestController::setMockSpeechInputResult);
+  BindMethod("addMockSpeechInputResult", &LayoutTestController::addMockSpeechInputResult);
 
   // The fallback method is called when an unknown method is invoked.
   BindFallbackMethod(&LayoutTestController::fallbackMethod);
 
   // Shared properties.
   // globalFlag is used by a number of layout tests in
   // LayoutTests\http\tests\security\dataURL.
   BindProperty("globalFlag", &globalFlag_);
   // webHistoryItemCount is used by tests in LayoutTests\http\tests\history
   BindProperty("webHistoryItemCount", &webHistoryItemCount_);
@@ skipping 905 matching lines @@
 void LayoutTestController::setAllowFileAccessFromFileURLs(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isBool()) {
     WebPreferences* prefs = shell_->GetWebPreferences();
     prefs->allow_file_access_from_file_urls = args[0].value.boolValue;
     prefs->Apply(shell_->webView());
   }
   result->SetNull();
 }
 
-void LayoutTestController::setMockSpeechInputResult(const CppArgumentList& args,
+void LayoutTestController::addMockSpeechInputResult(const CppArgumentList& args,
                                                     CppVariant* result) {
-  if (args.size() > 0 && args[0].isString() && args[1].isString()) {
-    shell_->speech_input_controller_mock()->setMockRecognitionResult(
-        WebString::fromUTF8(args[0].ToString()),
-        WebString::fromUTF8(args[1].ToString()));
+  if (args.size() > 0 && args[0].isString() && args[1].isNumber() &&
+      args[2].isString()) {
+    shell_->speech_input_controller_mock()->addMockRecognitionResult(
+        WebString::fromUTF8(args[0].ToString()), args[1].ToDouble(),
+        WebString::fromUTF8(args[2].ToString()));
   }
   result->SetNull();
 }
 
 // Need these conversions because the format of the value for booleans
 // may vary - for example, on mac "1" and "0" are used for boolean.
 bool LayoutTestController::CppVariantToBool(const CppVariant& value) {
   if (value.isBool())
     return value.ToBoolean();
   else if (value.isNumber())
@@ skipping 387 matching lines @@
   shell_->device_orientation_client_mock()->setOrientation(orientation);
 }
 
 void LayoutTestController::hasSpellingMarker(const CppArgumentList& arguments,
                                              CppVariant* result) {
   if (arguments.size() < 2 || !arguments[0].isNumber() || !arguments[1].isNumber())
     return;
   result->Set(shell_->webView()->mainFrame()->selectionStartHasSpellingMarkerFor(
       arguments[0].ToInt32(), arguments[1].ToInt32()));
 }