content/browser: Move speech code into content namespace.

content/browser/speech/google_streaming_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_STREAMING_REMOTE_ENGINE_H_
 #define CONTENT_BROWSER_SPEECH_GOOGLE_STREAMING_REMOTE_ENGINE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/browser/speech/audio_encoder.h"
 #include "content/browser/speech/chunked_byte_buffer.h"
 #include "content/browser/speech/speech_recognition_engine.h"
 #include "content/common/content_export.h"
 #include "content/public/common/speech_recognition_error.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
 
-namespace content {
-struct SpeechRecognitionError;
-struct SpeechRecognitionResult;
-}
-
 namespace net {
 class URLRequestContextGetter;
 }
 
-namespace speech {
+namespace content {
 
 class AudioChunk;
+struct SpeechRecognitionError;
+struct SpeechRecognitionResult;
 
 // Implements a SpeechRecognitionEngine supporting continuous recognition by
 // means of interaction with Google streaming speech recognition webservice.
 // More in details, this class establishes two HTTP(S) connections with the
 // webservice, for each session, herein called "upstream" and "downstream".
 // Audio chunks are sent on the upstream by means of a chunked HTTP POST upload.
 // Recognition results are retrieved in a full-duplex fashion (i.e. while
 // pushing audio on the upstream) on the downstream by means of a chunked
 // HTTP GET request. Pairing between the two stream is handled through a
 // randomly generated key, unique for each request, which is passed in the
@@ skipping 86 matching lines @@
 
   // The methods below handle transitions of the recognizer FSM.
   FSMState ConnectBothStreams(const FSMEventArgs& event_args);
   FSMState TransmitAudioUpstream(const FSMEventArgs& event_args);
   FSMState ProcessDownstreamResponse(const FSMEventArgs& event_args);
   FSMState RaiseNoMatchErrorIfGotNoResults(const FSMEventArgs& event_args);
   FSMState CloseUpstreamAndWaitForResults(const FSMEventArgs& event_args);
   FSMState CloseDownstream(const FSMEventArgs& event_args);
   FSMState AbortSilently(const FSMEventArgs& event_args);
   FSMState AbortWithError(const FSMEventArgs& event_args);
-  FSMState Abort(content::SpeechRecognitionErrorCode error);
+  FSMState Abort(SpeechRecognitionErrorCode error);
   FSMState DoNothing(const FSMEventArgs& event_args);
   FSMState NotFeasible(const FSMEventArgs& event_args);
 
   std::string GetAcceptedLanguages() const;
   std::string GenerateRequestKey() const;
 
   SpeechRecognitionEngineConfig config_;
   scoped_ptr<net::URLFetcher> upstream_fetcher_;
   scoped_ptr<net::URLFetcher> downstream_fetcher_;
   scoped_refptr<net::URLRequestContextGetter> url_context_;
   scoped_ptr<AudioEncoder> encoder_;
   ChunkedByteBuffer chunked_byte_buffer_;
   size_t previous_response_length_;
   bool got_last_definitive_result_;
   bool is_dispatching_event_;
   FSMState state_;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleStreamingRemoteEngine);
 };
 
-}  // namespace speech
+}  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_GOOGLE_STREAMING_REMOTE_ENGINE_H_