Remove SpeechRecognitionSessionConfig::is_legacy_api

content/browser/speech/speech_recognition_manager_impl.cc

 // Copyright (c) 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 "content/browser/speech/speech_recognition_manager_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 95 matching lines @@
   sessions_[session_id] = session;
   session->id = session_id;
   session->config = config;
   session->context = config.initial_context;
 
   std::string hardware_info;
   bool can_report_metrics = false;
   if (delegate_)
     delegate_->GetDiagnosticInformation(&can_report_metrics, &hardware_info);
 
-  // The legacy api cannot use continuous mode.
-  DCHECK(!config.is_legacy_api || !config.continuous);
-
 #if !defined(OS_ANDROID)
   // A SpeechRecognitionEngine (and corresponding Config) is required only
   // when using SpeechRecognizerImpl, which performs the audio capture and
   // endpointing in the browser. This is not the case of Android where, not
   // only the speech recognition, but also the audio capture and endpointing
   // activities performed outside of the browser (delegated via JNI to the
   // Android API implementation).
 
   SpeechRecognitionEngineConfig remote_engine_config;
   remote_engine_config.language = config.language;
   remote_engine_config.grammars = config.grammars;
   remote_engine_config.audio_sample_rate =
       SpeechRecognizerImpl::kAudioSampleRate;
   remote_engine_config.audio_num_bits_per_sample =
       SpeechRecognizerImpl::kNumBitsPerAudioSample;
   remote_engine_config.filter_profanities = config.filter_profanities;
   remote_engine_config.continuous = config.continuous;
   remote_engine_config.interim_results = config.interim_results;
   remote_engine_config.max_hypotheses = config.max_hypotheses;
   remote_engine_config.hardware_info = hardware_info;
   remote_engine_config.origin_url = config.origin_url;
   remote_engine_config.auth_token = config.auth_token;
   remote_engine_config.auth_scope = config.auth_scope;
   remote_engine_config.preamble = config.preamble;
 
-  SpeechRecognitionEngine* google_remote_engine;
-  if (config.is_legacy_api) {
-    google_remote_engine =
-        new GoogleOneShotRemoteEngine(config.url_request_context_getter.get());

[Primiano Tucci (use gerrit), 2016/04/13 17:40:59]

At this point in theory we could remove the GoogleOneShotRemoteEngine.
In practice IIRC that is still used by the recognizer unittest, so might not be
that easy. :)

[hans, 2016/04/13 17:41:50]

I have a CL for that :-) https://codereview.chromium.org/1886813002

-  } else {
-    google_remote_engine = new GoogleStreamingRemoteEngine(
-        config.url_request_context_getter.get());
-  }
-
+  SpeechRecognitionEngine* google_remote_engine =
+      new GoogleStreamingRemoteEngine(config.url_request_context_getter.get());
   google_remote_engine->SetConfig(remote_engine_config);
 
   session->recognizer = new SpeechRecognizerImpl(
       this,
       session_id,
       config.continuous,
       config.interim_results,
       google_remote_engine);
 #else
   session->recognizer = new SpeechRecognizerImplAndroid(this, session_id);
@@ skipping 521 matching lines @@
 SpeechRecognitionManagerImpl::Session::Session()
   : id(kSessionIDInvalid),
     abort_requested(false),
     listener_is_active(true) {
 }
 
 SpeechRecognitionManagerImpl::Session::~Session() {
 }
 
 }  // namespace content