| Index: chrome/common/service_process_util.cc
|
| diff --git a/chrome/common/service_process_util.cc b/chrome/common/service_process_util.cc
|
| index accccfe26f5ff8ac5bc4ea041aaa4a339d6ec21b..190755d298c8d110df0af1ab9e534391b971885a 100644
|
| --- a/chrome/common/service_process_util.cc
|
| +++ b/chrome/common/service_process_util.cc
|
| @@ -4,11 +4,14 @@
|
|
|
| #include "chrome/common/service_process_util.h"
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <algorithm>
|
|
|
| #include "base/base_switches.h"
|
| #include "base/command_line.h"
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/path_service.h"
|
| #include "base/sha1.h"
|
| @@ -17,6 +20,7 @@
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/version.h"
|
| +#include "build/build_config.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_switches.h"
|
| @@ -32,8 +36,8 @@
|
| namespace {
|
|
|
| // This should be more than enough to hold a version string assuming each part
|
| -// of the version string is an int64.
|
| -const uint32 kMaxVersionStringLength = 256;
|
| +// of the version string is an int64_t.
|
| +const uint32_t kMaxVersionStringLength = 256;
|
|
|
| // The structure that gets written to shared memory.
|
| struct ServiceProcessSharedData {
|
| @@ -247,7 +251,7 @@ bool ServiceProcessState::CreateSharedData() {
|
| if (!shared_mem_service_data.get())
|
| return false;
|
|
|
| - uint32 alloc_size = sizeof(ServiceProcessSharedData);
|
| + uint32_t alloc_size = sizeof(ServiceProcessSharedData);
|
| // TODO(viettrungluu): Named shared memory is deprecated (crbug.com/345734).
|
| if (!shared_mem_service_data->CreateNamedDeprecated
|
| (GetServiceProcessSharedMemName(), true, alloc_size))
|
|
|