| Index: chrome/test/logging/win/file_logger.h
|
| diff --git a/chrome/test/logging/win/file_logger.h b/chrome/test/logging/win/file_logger.h
|
| index 99d8d30a0a1958ea0def59917672356612203533..b39ab1919f9bd06b6a5c5caf80c138f5a1145d00 100644
|
| --- a/chrome/test/logging/win/file_logger.h
|
| +++ b/chrome/test/logging/win/file_logger.h
|
| @@ -6,8 +6,9 @@
|
| #define CHROME_TEST_LOGGING_WIN_FILE_LOGGER_H_
|
|
|
| #include <guiddef.h>
|
| +#include <stdint.h>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
| #include "base/strings/string16.h"
|
| #include "base/win/event_trace_controller.h"
|
|
|
| @@ -40,9 +41,9 @@ class FileLogger {
|
| CHROME_TESTS_LOG_PROVIDER = 1 << 2,
|
| };
|
|
|
| - static const uint32 kAllEventProviders = (CHROME_LOG_PROVIDER |
|
| - CHROME_FRAME_LOG_PROVIDER |
|
| - CHROME_TESTS_LOG_PROVIDER);
|
| + static const uint32_t kAllEventProviders =
|
| + (CHROME_LOG_PROVIDER | CHROME_FRAME_LOG_PROVIDER |
|
| + CHROME_TESTS_LOG_PROVIDER);
|
|
|
| FileLogger();
|
| ~FileLogger();
|
| @@ -52,7 +53,7 @@ class FileLogger {
|
|
|
| // Initializes the instance to collect logs from the providers present in
|
| // the given mask; see EventProviderBits.
|
| - void Initialize(uint32 event_provider_mask);
|
| + void Initialize(uint32_t event_provider_mask);
|
|
|
| // Starts capturing logs from all providers into |log_file|. The common file
|
| // extension for such files is .etl. Returns false if the session could not
|
| @@ -75,7 +76,7 @@ class FileLogger {
|
| static bool is_initialized_;
|
|
|
| base::win::EtwTraceController controller_;
|
| - uint32 event_provider_mask_;
|
| + uint32_t event_provider_mask_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(FileLogger);
|
| };
|
|
|