Switch to standard integer types in blimp/.

blimp/net/blimp_message_checkpointer_unittest.cc

 // Copyright 2015 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 "blimp/net/blimp_message_checkpointer.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/test/test_mock_time_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "blimp/common/create_blimp_message.h"
@@ skipping 10 matching lines @@
 using testing::SaveArg;
 
 namespace blimp {
 
 namespace {
 class MockCheckpointObserver : public BlimpMessageCheckpointObserver {
  public:
   MockCheckpointObserver() {}
   ~MockCheckpointObserver() override {}
 
-  MOCK_METHOD1(OnMessageCheckpoint, void(int64));
+  MOCK_METHOD1(OnMessageCheckpoint, void(int64_t));
 };
 
 }  // namespace
 
-static scoped_ptr<BlimpMessage> CreateExpectedAckMessage(int64 id) {
+static scoped_ptr<BlimpMessage> CreateExpectedAckMessage(int64_t id) {
   scoped_ptr<BlimpMessage> message = make_scoped_ptr(new BlimpMessage);
   message->set_type(BlimpMessage::PROTOCOL_CONTROL);
   ProtocolControlMessage* protocol_control =
       message->mutable_protocol_control();
   protocol_control->set_type(ProtocolControlMessage::CHECKPOINT_ACK);
   CheckpointAckMessage* checkpoint_ack =
       protocol_control->mutable_checkpoint_ack();
   checkpoint_ack->set_checkpoint_id(id);
   return message;
 }
 
 class BlimpMessageCheckpointerTest : public testing::Test {
  public:
   BlimpMessageCheckpointerTest()
       : runner_(new base::TestMockTimeTaskRunner), runner_handle_(runner_) {}
 
   ~BlimpMessageCheckpointerTest() override {}
 
-  int64 SimulateIncomingMessage() {
+  int64_t SimulateIncomingMessage() {
     scoped_ptr<BlimpMessage> message(new BlimpMessage);
     message->set_message_id(++message_id_);
     message->set_type(BlimpMessage::INPUT);
     checkpointer_->ProcessMessage(
         std::move(message),
         base::Bind(&BlimpMessageCheckpointerTest::IncomingCompletionCallback,
                    base::Unretained(this)));
     return message_id_;
   }
 
   void SetUp() override {
     checkpointer_ = make_scoped_ptr(new BlimpMessageCheckpointer(
         &incoming_processor_, &outgoing_processor_, &checkpoint_observer_));
   }
 
   MOCK_METHOD1(IncomingCompletionCallback, void(int));
 
  protected:
   // Used to verify timing-specific behaviours.
   scoped_refptr<base::TestMockTimeTaskRunner> runner_;
   base::ThreadTaskRunnerHandle runner_handle_;
 
-  int64 message_id_ = 0;
+  int64_t message_id_ = 0;
 
   testing::StrictMock<MockBlimpMessageProcessor> incoming_processor_;
   testing::StrictMock<MockBlimpMessageProcessor> outgoing_processor_;
   testing::StrictMock<MockCheckpointObserver> checkpoint_observer_;
   net::CompletionCallback captured_cb_;
 
   scoped_ptr<BlimpMessageCheckpointer> checkpointer_;
 };
 
 TEST_F(BlimpMessageCheckpointerTest, CallbackPropagates) {
@@ skipping 86 matching lines @@
 
   // Simulate an incoming message.
   scoped_ptr<BlimpMessage> ack_message = CreateCheckpointAckMessage(10);
   checkpointer_->ProcessMessage(
       std::move(ack_message),
       base::Bind(&BlimpMessageCheckpointerTest::IncomingCompletionCallback,
                  base::Unretained(this)));
 }
 
 }  // namespace blimp