Switch to standard integer types in content/browser/.

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 <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
+#include "base/macros.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 "net/url_request/url_fetcher_delegate.h"
 
@@ skipping 42 matching lines @@
   void StartRecognition() override;
   void EndRecognition() override;
   void TakeAudioChunk(const AudioChunk& data) override;
   void AudioChunksEnded() override;
   bool IsRecognitionPending() const override;
   int GetDesiredAudioChunkDurationMs() const override;
 
   // net::URLFetcherDelegate methods.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
   void OnURLFetchDownloadProgress(const net::URLFetcher* source,
-                                  int64 current,
-                                  int64 total) override;
+                                  int64_t current,
+                                  int64_t total) override;
 
  private:
   // Response status codes from the speech recognition webservice.
   static const int kWebserviceStatusNoError;
   static const int kWebserviceStatusErrorNoMatch;
 
   // Frame type for framed POST data. Do NOT change these. They must match
   // values the server expects.
   enum FrameType {
     FRAME_PREAMBLE_AUDIO = 0,
@@ skipping 23 matching lines @@
   struct FSMEventArgs {
     explicit FSMEventArgs(FSMEvent event_value);
     ~FSMEventArgs();
 
     FSMEvent event;
 
     // In case of EVENT_AUDIO_CHUNK, holds the chunk pushed by |TakeAudioChunk|.
     scoped_refptr<const AudioChunk> audio_data;
 
     // In case of EVENT_DOWNSTREAM_RESPONSE, hold the current chunk bytes.
-    scoped_ptr<std::vector<uint8> > response;
+    scoped_ptr<std::vector<uint8_t>> response;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(FSMEventArgs);
   };
 
   // Invoked by both upstream and downstream URLFetcher callbacks to handle
   // new chunk data, connection closed or errors notifications.
   void DispatchHTTPResponse(const net::URLFetcher* source,
                             bool end_of_response);
 
@@ skipping 36 matching lines @@
   bool is_dispatching_event_;
   bool use_framed_post_data_;
   FSMState state_;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleStreamingRemoteEngine);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SPEECH_GOOGLE_STREAMING_REMOTE_ENGINE_H_