Switch to standard integer types in google_apis/.

google_apis/gcm/engine/gservices_settings.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 GOOGLE_APIS_GCM_ENGINE_GSERVICES_SETTINGS_H_
 #define GOOGLE_APIS_GCM_ENGINE_GSERVICES_SETTINGS_H_
 
 #include <map>
 #include <string>
 
+#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "google_apis/gcm/base/gcm_export.h"
 #include "google_apis/gcm/engine/gcm_store.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
 #include "url/gurl.h"
 
 namespace gcm {
 
 // Class responsible for handling G-services settings. It takes care of
@@ skipping 49 matching lines @@
 
   // Factory for creating references in callbacks.
   base::WeakPtrFactory<GServicesSettings> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GServicesSettings);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_GSERVICES_SETTINGS_H_