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

chrome/browser/signin/easy_unlock_service_regular.cc

 // 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.
 
 #include "chrome/browser/signin/easy_unlock_service_regular.h"
 
+#include <stdint.h>
+
 #include "base/base64url.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/sys_info.h"
 #include "base/time/default_clock.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
 #include "chrome/browser/signin/chrome_proximity_auth_client.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/extensions/api/easy_unlock_private.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/login/user_names.h"
@@ skipping 586 matching lines @@
   // The Chrome OS version tracks the Chrome version, so fill in the same value
   // as |device_software_version_code|.
   device_info.set_device_os_version_code(software_version_code);
 
   // There may not be a Shell instance in tests.
   if (!ash::Shell::HasInstance())
     return device_info;
 
   ash::DisplayManager* display_manager =
       ash::Shell::GetInstance()->display_manager();
-  int64 primary_display_id = display_manager->GetPrimaryDisplayCandidate().id();
+  int64_t primary_display_id =
+      display_manager->GetPrimaryDisplayCandidate().id();
   ash::DisplayInfo display_info =
       display_manager->GetDisplayInfo(primary_display_id);
   gfx::Rect bounds = display_info.bounds_in_native();
 
   // TODO(tengs): This is a heuristic to deterimine the DPI of the display, as
   // there is no convenient way of getting this information right now.
   const double dpi = display_info.device_scale_factor() > 1.0f ? 239.0f : 96.0f;
   double width_in_inches = (bounds.width() - bounds.x()) / dpi;
   double height_in_inches = (bounds.height() - bounds.y()) / dpi;
   double diagonal_in_inches = sqrt(width_in_inches * width_in_inches +
@@ skipping 39 matching lines @@
     PA_LOG(INFO) << "Refresh token not yet available, "
                  << "waiting before starting CryptAuth managers";
     token_service->AddObserver(this);
   }
 
   device_manager_->AddObserver(this);
   enrollment_manager_->Start();
   device_manager_->Start();
 }
 #endif