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

components/gcm_driver/gcm_client_impl.h

 // 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.
 
 #ifndef COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_
 #define COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "components/gcm_driver/gcm_client.h"
 #include "components/gcm_driver/gcm_stats_recorder_impl.h"
 #include "google_apis/gcm/base/mcs_message.h"
 #include "google_apis/gcm/engine/gcm_store.h"
 #include "google_apis/gcm/engine/gservices_settings.h"
 #include "google_apis/gcm/engine/mcs_client.h"
 #include "google_apis/gcm/engine/registration_request.h"
@@ skipping 122 matching lines @@
   // The check-in info for the device.
   // TODO(fgorski): Convert to a class with explicit getters/setters.
   struct CheckinInfo {
     CheckinInfo();
     ~CheckinInfo();
     bool IsValid() const { return android_id != 0 && secret != 0; }
     void SnapshotCheckinAccounts();
     void Reset();
 
     // Android ID of the device as assigned by the server.
-    uint64 android_id;
+    uint64_t android_id;
     // Security token of the device as assigned by the server.
-    uint64 secret;
+    uint64_t secret;
     // True if accounts were already provided through SetAccountsForCheckin(),
     // or when |last_checkin_accounts| was loaded as empty.
     bool accounts_set;
     // Map of account email addresses and OAuth2 tokens that will be sent to the
     // checkin server on a next checkin.
     std::map<std::string, std::string> account_tokens;
     // As set of accounts last checkin was completed with.
     std::set<std::string> last_checkin_accounts;
   };
 
@@ skipping 15 matching lines @@
   friend class GCMClientImplTest;
   friend class GCMClientInstanceIDTest;
 
   // Returns text representation of the enum State.
   std::string GetStateString() const;
 
   // Callbacks for the MCSClient.
   // Receives messages and dispatches them to relevant user delegates.
   void OnMessageReceivedFromMCS(const gcm::MCSMessage& message);
   // Receives confirmation of sent messages or information about errors.
-  void OnMessageSentToMCS(int64 user_serial_number,
+  void OnMessageSentToMCS(int64_t user_serial_number,
                           const std::string& app_id,
                           const std::string& message_id,
                           MCSClient::MessageSendStatus status);
   // Receives information about mcs_client_ errors.
   void OnMCSError();
 
   // Runs after GCM Store load is done to trigger continuation of the
   // initialization.
   void OnLoadCompleted(scoped_ptr<GCMStore::LoadResult> result);
   // Starts the GCM.
@@ skipping 165 matching lines @@
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GCMClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GCMClientImpl);
 };
 
 }  // namespace gcm
 
 #endif  // COMPONENTS_GCM_DRIVER_GCM_CLIENT_IMPL_H_