Switch to standard integer types in google_apis/.

google_apis/gcm/engine/gcm_store_impl_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 "google_apis/gcm/engine/gcm_store_impl.h"
 
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/test/test_simple_task_runner.h"
@@ skipping 14 matching lines @@
 // Number of per-app messages in tests.
 const int kNumMessagesPerApp = 20;
 
 // App name for testing.
 const char kAppName[] = "my_app";
 const char kAppName2[] = "my_app_2";
 
 // Category name for testing.
 const char kCategoryName[] = "my_category";
 
-const uint64 kDeviceId = 22;
-const uint64 kDeviceToken = 55;
+const uint64_t kDeviceId = 22;
+const uint64_t kDeviceToken = 55;
 
 class GCMStoreImplTest : public testing::Test {
  public:
   GCMStoreImplTest();
   ~GCMStoreImplTest() override;
 
   scoped_ptr<GCMStoreImpl> BuildGCMStore();
   void LoadGCMStore(
       GCMStoreImpl* gcm_store, scoped_ptr<GCMStore::LoadResult>* result_dst);
 
   std::string GetNextPersistentId();
 
   void PumpLoop();
 
   void LoadCallback(scoped_ptr<GCMStore::LoadResult>* result_dst,
                     scoped_ptr<GCMStore::LoadResult> result);
   void LoadWithoutCheckCallback(scoped_ptr<GCMStore::LoadResult>* result_dst,
                                 scoped_ptr<GCMStore::LoadResult> result);
   void UpdateCallback(bool success);
 
  protected:
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
   base::ScopedTempDir temp_directory_;
   bool expected_success_;
-  uint64 next_persistent_id_;
+  uint64_t next_persistent_id_;
 };
 
 GCMStoreImplTest::GCMStoreImplTest()
     : task_runner_(new base::TestSimpleTaskRunner()),
       task_runner_handle_(task_runner_),
       expected_success_(true),
       next_persistent_id_(base::Time::Now().ToInternalValue()) {
   EXPECT_TRUE(temp_directory_.CreateUniqueTempDir());
 }
 
@@ skipping 649 matching lines @@
 
   ASSERT_EQ(1u, load_result->instance_id_data.size());
   ASSERT_TRUE(load_result->instance_id_data.find(kAppName2) !=
               load_result->instance_id_data.end());
   EXPECT_EQ(instance_id_data2, load_result->instance_id_data[kAppName2]);
 }
 
 }  // namespace
 
 }  // namespace gcm