Introducing new data types and IPC messages for scripted JS speech recognition APIs (Speech CL2.0)

content/browser/speech/google_one_shot_remote_engine.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_SPEECH_GOOGLE_ONE_SHOT_REMOTE_ENGINE_H_
 #define CONTENT_BROWSER_SPEECH_GOOGLE_ONE_SHOT_REMOTE_ENGINE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 13 matching lines @@
 }
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace speech {
 
 class AudioChunk;
 
-struct CONTENT_EXPORT GoogleOneShotRemoteEngineConfig {
-  std::string language;
-  std::string grammar;
-  bool filter_profanities;
-  std::string hardware_info;
-  std::string origin_url;
-  int audio_sample_rate;
-  int audio_num_bits_per_sample;
-
-  GoogleOneShotRemoteEngineConfig();
-  ~GoogleOneShotRemoteEngineConfig();
-};
-
 // Implements a SpeechRecognitionEngine by means of remote interaction with
 // Google speech recognition webservice.
 class CONTENT_EXPORT GoogleOneShotRemoteEngine
     : public NON_EXPORTED_BASE(SpeechRecognitionEngine),
       public content::URLFetcherDelegate {
  public:
   // Duration of each audio packet.
   static const int kAudioPacketIntervalMs;
   // ID passed to URLFetcher::Create(). Used for testing.
   static int url_fetcher_id_for_tests;
 
   explicit GoogleOneShotRemoteEngine(net::URLRequestContextGetter* context);
   virtual ~GoogleOneShotRemoteEngine();
-  void SetConfig(const GoogleOneShotRemoteEngineConfig& config);
 
   // SpeechRecognitionEngine methods.
+  virtual void SetConfig(const SpeechRecognitionEngineConfig& config) OVERRIDE;
   virtual void StartRecognition() OVERRIDE;
   virtual void EndRecognition() OVERRIDE;
   virtual void TakeAudioChunk(const AudioChunk& data) OVERRIDE;
   virtual void AudioChunksEnded() OVERRIDE;
   virtual bool IsRecognitionPending() const OVERRIDE;
   virtual int GetDesiredAudioChunkDurationMs() const OVERRIDE;
 
   // content::URLFetcherDelegate methods.
   virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
 
  private:
-  GoogleOneShotRemoteEngineConfig config_;
+  SpeechRecognitionEngineConfig config_;
   scoped_ptr<content::URLFetcher> url_fetcher_;
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   scoped_ptr<AudioEncoder> encoder_;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleOneShotRemoteEngine);
 };
 
 }  // namespace speech
 
 #endif  // CONTENT_BROWSER_SPEECH_GOOGLE_ONE_SHOT_REMOTE_ENGINE_H_