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

Index: content/browser/speech/google_one_shot_remote_engine.h
diff --git a/content/browser/speech/google_one_shot_remote_engine.h b/content/browser/speech/google_one_shot_remote_engine.h
index 7e47c67dd68b4c323d21337662b595d6a507beba..180ad137e75dda5252ca651c5e37bf2c41b2606e 100644
--- a/content/browser/speech/google_one_shot_remote_engine.h
+++ b/content/browser/speech/google_one_shot_remote_engine.h
@@ -31,19 +31,6 @@ 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
@@ -57,9 +44,9 @@ class CONTENT_EXPORT GoogleOneShotRemoteEngine
 
   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;
@@ -71,7 +58,7 @@ class CONTENT_EXPORT GoogleOneShotRemoteEngine
   virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
  private:
-  GoogleOneShotRemoteEngineConfig config_;
+  SpeechRecognitionEngineConfig config_;
   scoped_ptr<content::URLFetcher> url_fetcher_;
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   scoped_ptr<AudioEncoder> encoder_;