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

components/metrics/metrics_state_manager_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_state_manager.h"
 
 #include <ctype.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/prefs/testing_pref_service.h"
 #include "components/metrics/client_info.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_switches.h"
 #include "components/variations/caching_permuted_entropy_provider.h"
 #include "components/variations/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace metrics {
@@ skipping 189 matching lines @@
 
     state_manager->GetLowEntropySource();
 
     EXPECT_FALSE(prefs_.GetBoolean(prefs::kMetricsResetIds));
   }
 
   EXPECT_NE(kInitialClientId, prefs_.GetString(prefs::kMetricsClientID));
 }
 
 TEST_F(MetricsStateManagerTest, ForceClientIdCreation) {
-  const int64 kFakeInstallationDate = 12345;
+  const int64_t kFakeInstallationDate = 12345;
   prefs_.SetInt64(prefs::kInstallDate, kFakeInstallationDate);
 
-  const int64 test_begin_time = base::Time::Now().ToTimeT();
+  const int64_t test_begin_time = base::Time::Now().ToTimeT();
 
   // Holds ClientInfo from previous scoped test for extra checks.
   scoped_ptr<ClientInfo> previous_client_info;
 
   {
     scoped_ptr<MetricsStateManager> state_manager(CreateStateManager());
 
     // client_id shouldn't be auto-generated if metrics reporting is not
     // enabled.
     EXPECT_EQ(std::string(), state_manager->client_id());
@@ skipping 39 matching lines @@
               stored_client_info_backup_->reporting_enabled_date);
 
     // Re-forcing client id creation shouldn't cause another backup and
     // shouldn't affect the existing client id.
     stored_client_info_backup_.reset();
     state_manager->ForceClientIdCreation();
     EXPECT_FALSE(stored_client_info_backup_);
     EXPECT_EQ(previous_client_info->client_id, state_manager->client_id());
   }
 
-  const int64 kBackupInstallationDate = 1111;
-  const int64 kBackupReportingEnabledDate = 2222;
+  const int64_t kBackupInstallationDate = 1111;
+  const int64_t kBackupReportingEnabledDate = 2222;
   const char kBackupClientId[] = "AAAAAAAA-BBBB-CCCC-DDDD-EEEEEEEEEEEE";
   fake_client_info_backup_.reset(new ClientInfo);
   fake_client_info_backup_->client_id = kBackupClientId;
   fake_client_info_backup_->installation_date = kBackupInstallationDate;
   fake_client_info_backup_->reporting_enabled_date =
       kBackupReportingEnabledDate;
 
   {
     // The existence of a backup should result in the same behaviour as
     // before if we already have a client id.
@@ skipping 77 matching lines @@
 
     // The metrics-reporting-enabled date will be reset to Now().
     EXPECT_GE(prefs_.GetInt64(prefs::kMetricsReportingEnabledTimestamp),
               previous_client_info->reporting_enabled_date);
 
     stored_client_info_backup_.reset();
   }
 }
 
 }  // namespace metrics