Switch to standard integer types in media/.

media/cast/logging/stats_event_subscriber.h

 // Copyright 2014 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 MEDIA_CAST_LOGGING_STATS_EVENT_SUBSCRIBER_H_
 #define MEDIA_CAST_LOGGING_STATS_EVENT_SUBSCRIBER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 72 matching lines @@
    public:
     // This will create N+2 buckets where N = (max - min) / width:
     // Underflow bucket: < min
     // Bucket 0: [min, min + width - 1]
     // Bucket 1: [min + width, min + 2 * width - 1]
     // ...
     // Bucket N-1: [max - width, max - 1]
     // Overflow bucket: >= max
     // |min| must be less than |max|.
     // |width| must divide |max - min| evenly.
-    SimpleHistogram(int64 min, int64 max, int64 width);
+    SimpleHistogram(int64_t min, int64_t max, int64_t width);
 
     ~SimpleHistogram();
 
-    void Add(int64 sample);
+    void Add(int64_t sample);
 
     void Reset();
 
     scoped_ptr<base::ListValue> GetHistogram() const;
 
    private:
-    int64 min_;
-    int64 max_;
-    int64 width_;
+    int64_t min_;
+    int64_t max_;
+    int64_t width_;
     std::vector<int> buckets_;
   };
 
   enum CastStat {
     // Capture frame rate.
     CAPTURE_FPS,
     // Encode frame rate.
     ENCODE_FPS,
     // Decode frame rate.
     DECODE_FPS,
@@ skipping 59 matching lines @@
 
     base::TimeTicks capture_time;
     base::TimeTicks capture_end_time;
     base::TimeTicks encode_end_time;
     bool encoded;
   };
 
   typedef std::map<CastStat, double> StatsMap;
   typedef std::map<CastStat, linked_ptr<SimpleHistogram> > HistogramMap;
   typedef std::map<RtpTimestamp, FrameInfo> FrameInfoMap;
-  typedef std::map<
-      std::pair<RtpTimestamp, uint16>,
-      std::pair<base::TimeTicks, CastLoggingEvent> >
+  typedef std::map<std::pair<RtpTimestamp, uint16_t>,
+                   std::pair<base::TimeTicks, CastLoggingEvent>>
       PacketEventTimeMap;
   typedef std::map<CastLoggingEvent, FrameLogStats> FrameStatsMap;
   typedef std::map<CastLoggingEvent, PacketLogStats> PacketStatsMap;
 
   static const char* CastStatToString(CastStat stat);
 
   void InitHistograms();
 
   // Assigns |stats_map| with stats data. Used for testing.
   void GetStatsInternal(StatsMap* stats_map) const;
@@ skipping 77 matching lines @@
   HistogramMap histograms_;
 
   base::ThreadChecker thread_checker_;
   DISALLOW_COPY_AND_ASSIGN(StatsEventSubscriber);
 };
 
 }  // namespace cast
 }  // namespace media
 
 #endif  // MEDIA_CAST_LOGGING_STATS_EVENT_SUBSCRIBER_H_