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

components/gcm_driver/instance_id/instance_id_impl.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 "components/gcm_driver/instance_id/instance_id_impl.h"
 
+#include <stdint.h>
+
 #include <algorithm>
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "components/gcm_driver/gcm_driver_desktop.h"
 #include "crypto/random.h"
 
@@ skipping 209 matching lines @@
 }
 
 void InstanceIDImpl::GetInstanceIDDataCompleted(
     const std::string& instance_id,
     const std::string& extra_data) {
   id_ = instance_id;
 
   if (extra_data.empty()) {
     creation_time_ = base::Time();
   } else {
-    int64 time_internal = 0LL;
+    int64_t time_internal = 0LL;
     if (!base::StringToInt64(extra_data, &time_internal)) {
       DVLOG(1) << "Failed to parse the time data: " + extra_data;
       return;
     }
     creation_time_ = base::Time::FromInternalValue(time_internal);
   }
 
   delayed_task_controller_.SetReady();
 }
 
 gcm::InstanceIDHandler* InstanceIDImpl::GetInstanceIDHandler() const {
   gcm::InstanceIDHandler* handler = gcm_driver_->GetInstanceIDHandler();
   DCHECK(handler);
   return handler;
 }
 
 void InstanceIDImpl::EnsureIDGenerated() {
   if (!id_.empty())
     return;
 
   // Now produce the ID in the following steps:
 
   // 1) Generates the random number in 8 bytes which is required by the server.
   //    We don't want to be strictly cryptographically secure. The server might
   //    reject the ID if there is a conflict or problem.
-  uint8 bytes[kInstanceIDByteLength];
+  uint8_t bytes[kInstanceIDByteLength];
   crypto::RandBytes(bytes, sizeof(bytes));
 
   // 2) Transforms the first 4 bits to 0x7. Note that this is required by the
   //    server.
   bytes[0] &= 0x0f;
   bytes[0] |= 0x70;
 
   // 3) Encode the value in Android-compatible base64 scheme:
   //    * URL safe: '/' replaced by '_' and '+' replaced by '-'.
   //    * No padding: any trailing '=' will be removed.
   base::Base64Encode(
       base::StringPiece(reinterpret_cast<const char*>(bytes), sizeof(bytes)),
       &id_);
   std::replace(id_.begin(), id_.end(), '+', '-');
   std::replace(id_.begin(), id_.end(), '/', '_');
   id_.erase(std::remove(id_.begin(), id_.end(), '='), id_.end());
 
   creation_time_ = base::Time::Now();
 
   // Save to the persistent store.
   GetInstanceIDHandler()->AddInstanceIDData(
       app_id(),
       id_,
       base::Int64ToString(creation_time_.ToInternalValue()));
 }
 
 }  // namespace instance_id