Switch to standard integer types in chrome/.

chrome/test/logging/win/file_logger.cc

 // Copyright (c) 2012 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/test/logging/win/file_logger.h"
 
 #include <windows.h>
 #include <guiddef.h>
 #include <objbase.h>
+#include <stddef.h>
 
 #include <ios>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
+#include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/event_trace_consumer.h"
 #include "base/win/registry.h"
 
 namespace logging_win {
 
 namespace {
 
 const wchar_t kChromeTestSession[] = L"chrome_tests";
@@ skipping 10 matching lines @@
 
 // {81729947-CD2A-49e6-8885-785429F339F5}
 const GUID kChromeTestsProvider =
     { 0x81729947, 0xcd2a, 0x49e6,
         { 0x88, 0x85, 0x78, 0x54, 0x29, 0xf3, 0x39, 0xf5 } };
 
 // The configurations for the supported providers.  This must be in sync with
 // FileLogger::EventProviderBits.
 const struct {
   const GUID* provider_name;
-  uint8 level;
-  uint32 flags;
+  uint8_t level;
+  uint32_t flags;
 } kProviders[] = {
   { &kChromeTraceProviderName, 255, 0 },
   { &kChromeFrameProvider, 255, 0 },
   { &kChromeTestsProvider, 255, 0 },
 };
 
 static_assert((1 << arraysize(kProviders)) - 1 ==
                   FileLogger::kAllEventProviders,
               "size of kProviders is inconsistent with kAllEventProviders");
 
@@ skipping 63 matching lines @@
   }
 
   if (event_provider_mask_ & CHROME_TESTS_LOG_PROVIDER)
     logging::LogEventProvider::Uninitialize();
 }
 
 void FileLogger::Initialize() {
   Initialize(kAllEventProviders);
 }
 
-void FileLogger::Initialize(uint32 event_provider_mask) {
+void FileLogger::Initialize(uint32_t event_provider_mask) {
   CHECK(!is_initialized_);
 
   // Stop a previous session that wasn't shut down properly.
   base::win::EtwTraceProperties ignore;
   HRESULT hr = base::win::EtwTraceController::Stop(kChromeTestSession,
                                                    &ignore);
   LOG_IF(ERROR, FAILED(hr) &&
              hr != HRESULT_FROM_WIN32(ERROR_WMI_INSTANCE_NOT_FOUND))
       << "Failed to stop a previous trace session; hr=" << std::hex << hr;
 
@@ skipping 34 matching lines @@
 
   hr = controller_.Flush(NULL);
   LOG_IF(ERROR, FAILED(hr))
       << "Failed to flush events; hr=" << std::hex << hr;
   hr = controller_.Stop(NULL);
   LOG_IF(ERROR, FAILED(hr))
       << "Failed to stop ETW session; hr=" << std::hex << hr;
 }
 
 }  // namespace logging_win