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

chrome/browser/caps/generate_state_json.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/caps/generate_state_json.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/cpu.h"
 #include "base/files/file.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/values.h"
+#include "build/build_config.h"
 #include "chrome/browser/task_manager/task_manager.h"
 
 namespace {
 
 std::string Key(base::ProcessId pid, const char* category) {
   return category ?
       base::StringPrintf("process.%d.%s", pid, category) :
       base::StringPrintf("process.%d", pid);
 }
 
@@ skipping 74 matching lines @@
     base::CPU cpu;
     dict->SetInteger("system.cpu.type", cpu.type());
     dict->SetInteger("system.cpu.family", cpu.family());
     dict->SetInteger("system.cpu.model", cpu.model());
     dict->SetInteger("system.cpu.stepping", cpu.stepping());
     dict->SetString("system.cpu.brand", cpu.cpu_brand());
     dict->SetInteger("system.cpu.logicalprocessors",
                      base::SysInfo::NumberOfProcessors());
     dict->SetInteger("system.cpu.logicalprocessors",
                      base::SysInfo::NumberOfProcessors());
-    int64 memory = base::SysInfo::AmountOfPhysicalMemory();
+    int64_t memory = base::SysInfo::AmountOfPhysicalMemory();
     dict->SetInteger("system.memory.physical", InMBFromB(memory));
     memory = base::SysInfo::AmountOfAvailablePhysicalMemory();
     dict->SetInteger("system.memory.available", InMBFromB(memory));
     dict->SetInteger("system.uptime", base::SysInfo::Uptime().InSeconds());
     dict->SetString("os.name", base::SysInfo::OperatingSystemName());
 #if !defined(OS_LINUX)
-    int32 major, minor, bugfix;
+    int32_t major, minor, bugfix;
     base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
     dict->SetInteger("os.version.major", major);
     dict->SetInteger("os.version.minor", minor);
     dict->SetInteger("os.version.bugfix", bugfix);
     dict->SetString("os.arch", base::SysInfo::OperatingSystemArchitecture());
 #endif
   }
 
   void GatherChromeValues(base::DictionaryValue* dict) {
     for (int index = 0; index != model_->ResourceCount(); ++index) {
@@ skipping 60 matching lines @@
 }  // namespace
 
 namespace caps {
 
 void GenerateStateJSON(
     scoped_refptr<TaskManagerModel> model, base::File file) {
   new TaskManagerDataDumper(model, file.Pass());
 }
 
 }