Switch to standard integer types in chrome/browser/, part 4 of 4.

chrome/browser/signin/chrome_proximity_auth_client.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 "chrome/browser/signin/chrome_proximity_auth_client.h"
 
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/sys_info.h"
 #include "base/version.h"
+#include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_window.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/signin/easy_unlock_service_regular.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "components/proximity_auth/cryptauth/cryptauth_client_impl.h"
 #include "components/proximity_auth/cryptauth/cryptauth_device_manager.h"
 #include "components/proximity_auth/cryptauth/cryptauth_enrollment_manager.h"
 #include "components/proximity_auth/cryptauth/secure_message_delegate.h"
@@ skipping 82 matching lines @@
 ChromeProximityAuthClient::CreateCryptAuthClientFactory() {
   return make_scoped_ptr(new proximity_auth::CryptAuthClientFactoryImpl(
       ProfileOAuth2TokenServiceFactory::GetForProfile(profile_), GetAccountId(),
       profile_->GetRequestContext(), GetDeviceClassifier()));
 }
 
 cryptauth::DeviceClassifier ChromeProximityAuthClient::GetDeviceClassifier() {
   cryptauth::DeviceClassifier device_classifier;
 
 #if defined(OS_CHROMEOS)
-  int32 major_version, minor_version, bugfix_version;
+  int32_t major_version, minor_version, bugfix_version;
   // TODO(tengs): base::OperatingSystemVersionNumbers only works for ChromeOS.
   // We need to get different numbers for other platforms.
   base::SysInfo::OperatingSystemVersionNumbers(&major_version, &minor_version,
                                                &bugfix_version);
   device_classifier.set_device_os_version_code(major_version);
   device_classifier.set_device_type(cryptauth::CHROME);
 #endif
 
   const std::vector<uint32_t>& version_components =
       base::Version(version_info::GetVersionNumber()).components();
@@ skipping 30 matching lines @@
 }
 
 EasyUnlockServiceRegular*
 ChromeProximityAuthClient::GetEasyUnlockServiceRegular() {
   EasyUnlockService* easy_unlock_service = EasyUnlockService::Get(profile_);
   if (easy_unlock_service->GetType() == EasyUnlockService::TYPE_REGULAR)
     return static_cast<EasyUnlockServiceRegular*>(easy_unlock_service);
   else
     return nullptr;
 }