Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4207)

Unified Diff: base/win/event_trace_consumer_unittest.cc

Issue 1507413003: clang/win: Let some chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content_browsertests Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/win/enum_variant_unittest.cc ('k') | base/win/event_trace_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ecbf238bea48c88429e22930957e10bdf82280ab..b159b93e138df261a64646d2eae4dfeb19df6230 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -209,7 +209,8 @@ TEST_F(EtwTraceConsumerRealtimeTest, ConsumerReturnsWhenSessionClosed) {
ASSERT_HRESULT_SUCCEEDED(StartConsumerThread());
// Wait around for the consumer_ thread a bit.
- ASSERT_EQ(WAIT_TIMEOUT, ::WaitForSingleObject(consumer_thread_.Get(), 50));
+ ASSERT_EQ(static_cast<DWORD>(WAIT_TIMEOUT),
+ ::WaitForSingleObject(consumer_thread_.Get(), 50));
ASSERT_HRESULT_SUCCEEDED(controller.Stop(NULL));
// The consumer_ returns success on session stop.
@@ -237,14 +238,14 @@ TEST_F(EtwTraceConsumerRealtimeTest, ConsumeEvent) {
test_provider_, TRACE_LEVEL_VERBOSE, 0xFFFFFFFF));
EtwTraceProvider provider(test_provider_);
- ASSERT_EQ(ERROR_SUCCESS, provider.Register());
+ ASSERT_EQ(static_cast<DWORD>(ERROR_SUCCESS), provider.Register());
// Start the consumer_.
ASSERT_HRESULT_SUCCEEDED(StartConsumerThread());
- ASSERT_EQ(0, TestConsumer::events_.size());
+ ASSERT_EQ(0u, TestConsumer::events_.size());
EtwMofEvent<1> event(kTestEventType, 1, TRACE_LEVEL_ERROR);
- EXPECT_EQ(ERROR_SUCCESS, provider.Log(&event.header));
+ EXPECT_EQ(static_cast<DWORD>(ERROR_SUCCESS), provider.Log(&event.header));
EXPECT_EQ(WAIT_OBJECT_0,
::WaitForSingleObject(TestConsumer::sank_event_.Get(), INFINITE));
ASSERT_HRESULT_SUCCEEDED(controller.Stop(NULL));
@@ -294,9 +295,9 @@ class EtwTraceConsumerDataTest: public EtwTraceConsumerBaseTest {
EtwTraceProvider provider(test_provider_);
// Then register our provider, means we get a session handle immediately.
- EXPECT_EQ(ERROR_SUCCESS, provider.Register());
+ EXPECT_EQ(static_cast<DWORD>(ERROR_SUCCESS), provider.Register());
// Trace the event, it goes to the temp file.
- EXPECT_EQ(ERROR_SUCCESS, provider.Log(header));
+ EXPECT_EQ(static_cast<DWORD>(ERROR_SUCCESS), provider.Log(header));
EXPECT_HRESULT_SUCCEEDED(controller.DisableProvider(test_provider_));
EXPECT_HRESULT_SUCCEEDED(provider.Unregister());
EXPECT_HRESULT_SUCCEEDED(controller.Flush(NULL));
« no previous file with comments | « base/win/enum_variant_unittest.cc ('k') | base/win/event_trace_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698