Switch to standard integer types in components/, part 2 of 4.

components/metrics/metrics_service_unittest.cc

 // 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.
 
 #include "components/metrics/metrics_service.h"
 
+#include <stdint.h>
+
 #include <string>
 
 #include "base/bind.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/metrics_hashes.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/threading/platform_thread.h"
 #include "components/compression/compression_utils.h"
 #include "components/metrics/client_info.h"
 #include "components/metrics/metrics_log.h"
 #include "components/metrics/metrics_pref_names.h"
@@ skipping 81 matching lines @@
       base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(1));
     }
   }
 
   // Returns true if there is a synthetic trial in the given vector that matches
   // the given trial name and trial group; returns false otherwise.
   bool HasSyntheticTrial(
       const std::vector<variations::ActiveGroupId>& synthetic_trials,
       const std::string& trial_name,
       const std::string& trial_group) {
-    uint32 trial_name_hash = HashName(trial_name);
-    uint32 trial_group_hash = HashName(trial_group);
+    uint32_t trial_name_hash = HashName(trial_name);
+    uint32_t trial_group_hash = HashName(trial_group);
     for (const variations::ActiveGroupId& trial : synthetic_trials) {
       if (trial.name == trial_name_hash && trial.group == trial_group_hash)
         return true;
     }
     return false;
   }
 
   // Finds a histogram with the specified |name_hash| in |histograms|.
   const base::HistogramBase* FindHistogram(
       const base::StatisticsRecorder::Histograms& histograms,
-      uint64 name_hash) {
+      uint64_t name_hash) {
     for (const base::HistogramBase* histogram : histograms) {
       if (name_hash == base::HashMetricName(histogram->histogram_name()))
         return histogram;
     }
     return nullptr;
   }
 
   // Checks whether |uma_log| contains any histograms that are not flagged
   // with kUmaStabilityHistogramFlag. Stability logs should only contain such
   // histograms.
   void CheckForNonStabilityHistograms(
       const ChromeUserMetricsExtension& uma_log) {
     const int kStabilityFlags = base::HistogramBase::kUmaStabilityHistogramFlag;
     base::StatisticsRecorder::Histograms histograms;
     base::StatisticsRecorder::GetHistograms(&histograms);
     for (int i = 0; i < uma_log.histogram_event_size(); ++i) {
-      const uint64 hash = uma_log.histogram_event(i).name_hash();
+      const uint64_t hash = uma_log.histogram_event(i).name_hash();
 
       const base::HistogramBase* histogram = FindHistogram(histograms, hash);
       EXPECT_TRUE(histogram) << hash;
 
       EXPECT_EQ(kStabilityFlags, histogram->flags() & kStabilityFlags) << hash;
     }
   }
 
  private:
   bool is_metrics_reporting_enabled() const {
@@ skipping 237 matching lines @@
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(scoped_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
   service.Stop();
 
   EXPECT_TRUE(test_provider->on_recording_disabled_called());
 }
 
 }  // namespace metrics