Index: base/win/event_trace_consumer_unittest.cc |
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc |
index f11f459ed5f7c4e92fff26c437837a6268551c6f..efbfdf9247593ce2328c2f60cd78c899e4864903 100644 |
--- a/base/win/event_trace_consumer_unittest.cc |
+++ b/base/win/event_trace_consumer_unittest.cc |
@@ -4,14 +4,16 @@ |
// |
// Unit tests for event trace consumer_ base class. |
#include "base/win/event_trace_consumer.h" |
+ |
#include <list> |
+ |
#include "base/basictypes.h" |
-#include "base/win/event_trace_controller.h" |
-#include "base/win/event_trace_provider.h" |
#include "base/file_path.h" |
#include "base/file_util.h" |
#include "base/logging.h" |
-#include "base/scoped_handle.h" |
+#include "base/win/event_trace_controller.h" |
+#include "base/win/event_trace_provider.h" |
+#include "base/win/scoped_handle.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include <initguid.h> // NOLINT - has to be last |
@@ -63,14 +65,14 @@ class TestConsumer: public EtwTraceConsumerBase<TestConsumer> { |
::SetEvent(sank_event_.Get()); |
} |
- static ScopedHandle sank_event_; |
+ static base::win::ScopedHandle sank_event_; |
static EventQueue events_; |
private: |
DISALLOW_COPY_AND_ASSIGN(TestConsumer); |
}; |
-ScopedHandle TestConsumer::sank_event_; |
+base::win::ScopedHandle TestConsumer::sank_event_; |
EventQueue TestConsumer::events_; |
const wchar_t* const kTestSessionName = L"TestLogSession"; |
@@ -175,8 +177,8 @@ class EtwTraceConsumerRealtimeTest: public testing::Test { |
} |
TestConsumer consumer_; |
- ScopedHandle consumer_ready_; |
- ScopedHandle consumer_thread_; |
+ base::win::ScopedHandle consumer_ready_; |
+ base::win::ScopedHandle consumer_thread_; |
}; |
} // namespace |