| Index: chrome/browser/service_process/service_process_control.cc
|
| diff --git a/chrome/browser/service_process/service_process_control.cc b/chrome/browser/service_process/service_process_control.cc
|
| index 5181ed682852ba4ce4351926e922822ad325ace9..f16da9c76ae318d00a9d310f0b8b46e164a08086 100644
|
| --- a/chrome/browser/service_process/service_process_control.cc
|
| +++ b/chrome/browser/service_process/service_process_control.cc
|
| @@ -18,6 +18,7 @@
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/threading/thread.h"
|
| #include "base/threading/thread_restrictions.h"
|
| +#include "build/build_config.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/upgrade_detector.h"
|
| @@ -159,7 +160,7 @@ bool ServiceProcessControl::OnMessageReceived(const IPC::Message& message) {
|
| return handled;
|
| }
|
|
|
| -void ServiceProcessControl::OnChannelConnected(int32 peer_pid) {
|
| +void ServiceProcessControl::OnChannelConnected(int32_t peer_pid) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| UMA_HISTOGRAM_ENUMERATION("CloudPrint.ServiceEvents",
|
| @@ -351,7 +352,7 @@ void ServiceProcessControl::Launcher::Notify() {
|
| void ServiceProcessControl::Launcher::DoDetectLaunched() {
|
| DCHECK(!notify_task_.is_null());
|
|
|
| - const uint32 kMaxLaunchDetectRetries = 10;
|
| + const uint32_t kMaxLaunchDetectRetries = 10;
|
| launched_ = CheckServiceProcessReady();
|
|
|
| int exit_code = 0;
|
|
|