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

components/gcm_driver/gcm_driver_desktop_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/gcm_driver/gcm_driver_desktop.h"
 
+#include <stdint.h>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
+#include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "components/gcm_driver/fake_gcm_app_handler.h"
 #include "components/gcm_driver/fake_gcm_client.h"
@@ skipping 811 matching lines @@
 // Tests a single instance of GCMDriver.
 class GCMChannelStatusSyncerTest : public GCMDriverTest {
  public:
   GCMChannelStatusSyncerTest();
   ~GCMChannelStatusSyncerTest() override;
 
   // testing::Test:
   void SetUp() override;
 
   void CompleteGCMChannelStatusRequest(bool enabled, int poll_interval_seconds);
-  bool CompareDelaySeconds(int64 expected_delay_seconds,
-                           int64 actual_delay_seconds);
+  bool CompareDelaySeconds(int64_t expected_delay_seconds,
+                           int64_t actual_delay_seconds);
 
   GCMChannelStatusSyncer* syncer() {
     return driver()->gcm_channel_status_syncer_for_testing();
   }
 
  private:
   net::TestURLFetcherFactory url_fetcher_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMChannelStatusSyncerTest);
 };
@@ skipping 27 matching lines @@
   response_proto.SerializeToString(&response_string);
 
   net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   fetcher->set_response_code(net::HTTP_OK);
   fetcher->SetResponseString(response_string);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 }
 
 bool GCMChannelStatusSyncerTest::CompareDelaySeconds(
-    int64 expected_delay_seconds, int64 actual_delay_seconds) {
+    int64_t expected_delay_seconds,
+    int64_t actual_delay_seconds) {
   // Most of time, the actual delay should not be smaller than the expected
   // delay.
   if (actual_delay_seconds >= expected_delay_seconds)
     return true;
   // It is also OK that the actual delay is a bit smaller than the expected
   // delay in case that the test runs slowly.
   return expected_delay_seconds - actual_delay_seconds < 30;
 }
 
 TEST_F(GCMChannelStatusSyncerTest, DisableAndEnable) {
@@ skipping 97 matching lines @@
   // Wait until the GCM channel status request gets triggered.
   PumpUILoop();
 
   // Keep delay such that we can find out the computed delay time.
   syncer()->set_delay_removed_for_testing(false);
 
   // Complete the request. The default interval is intact.
   CompleteGCMChannelStatusRequest(true, 0);
 
   // The next request should be scheduled at the expected default interval.
-  int64 actual_delay_seconds =
+  int64_t actual_delay_seconds =
       syncer()->current_request_delay_interval().InSeconds();
-  int64 expected_delay_seconds =
+  int64_t expected_delay_seconds =
       GCMChannelStatusRequest::default_poll_interval_seconds();
   EXPECT_TRUE(CompareDelaySeconds(expected_delay_seconds, actual_delay_seconds))
       << "expected delay: " << expected_delay_seconds
       << " actual delay: " << actual_delay_seconds;
 
   // Simulate browser start by recreating GCMDriver.
   ShutdownDriver();
   CreateDriver();
   AddAppHandlers();
 
@@ skipping 21 matching lines @@
 
   // Keep delay such that we can find out the computed delay time.
   syncer()->set_delay_removed_for_testing(false);
 
   // Complete the request. The interval is being changed.
   int new_poll_interval_seconds =
       GCMChannelStatusRequest::default_poll_interval_seconds() * 2;
   CompleteGCMChannelStatusRequest(true, new_poll_interval_seconds);
 
   // The next request should be scheduled at the expected updated interval.
-  int64 actual_delay_seconds =
+  int64_t actual_delay_seconds =
       syncer()->current_request_delay_interval().InSeconds();
-  int64 expected_delay_seconds = new_poll_interval_seconds;
+  int64_t expected_delay_seconds = new_poll_interval_seconds;
   EXPECT_TRUE(CompareDelaySeconds(expected_delay_seconds, actual_delay_seconds))
       << "expected delay: " << expected_delay_seconds
       << " actual delay: " << actual_delay_seconds;
 
   // Simulate browser start by recreating GCMDriver.
   ShutdownDriver();
   CreateDriver();
   AddAppHandlers();
 
   // After start-up, the request should still be scheduled at the expected
@@ skipping 217 matching lines @@
   PumpUILoop();
   EXPECT_EQ(GCMClient::UNKNOWN_ERROR, unregistration_result());
 
   // DeleteToken operation will be invoked after GCMClient becomes ready.
   GetGCMClient()->PerformDelayedStart();
   WaitForAsyncOperation();
   EXPECT_EQ(GCMClient::SUCCESS, unregistration_result());
 }
 
 }  // namespace gcm