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

Unified Diff: base/win/event_trace_consumer_unittest.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months 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
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 3043152af0c0beb6ea10679b5b6c6e4cf3c556b8..ecbf238bea48c88429e22930957e10bdf82280ab 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -82,7 +82,7 @@ class EtwTraceConsumerBaseTest: public testing::Test {
: session_name_(StringPrintf(L"TestSession-%d", GetCurrentProcId())) {
}
- virtual void SetUp() {
+ void SetUp() override {
// Cleanup any potentially dangling sessions.
EtwTraceProperties ignore;
EtwTraceController::Stop(session_name_.c_str(), &ignore);
@@ -91,7 +91,7 @@ class EtwTraceConsumerBaseTest: public testing::Test {
ASSERT_HRESULT_SUCCEEDED(::CoCreateGuid(&test_provider_));
}
- virtual void TearDown() {
+ void TearDown() override {
// Cleanup any potentially dangling sessions.
EtwTraceProperties ignore;
EtwTraceController::Stop(session_name_.c_str(), &ignore);
@@ -125,13 +125,13 @@ namespace {
class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest {
public:
- virtual void SetUp() {
+ void SetUp() override {
EtwTraceConsumerBaseTest::SetUp();
ASSERT_HRESULT_SUCCEEDED(
consumer_.OpenRealtimeSession(session_name_.c_str()));
}
- virtual void TearDown() {
+ void TearDown() override {
consumer_.Close();
EtwTraceConsumerBaseTest::TearDown();
}
@@ -261,7 +261,7 @@ class EtwTraceConsumerDataTest: public EtwTraceConsumerBaseTest {
EtwTraceConsumerDataTest() {
}
- virtual void SetUp() {
+ void SetUp() override {
EtwTraceConsumerBaseTest::SetUp();
EtwTraceProperties prop;
@@ -273,7 +273,7 @@ class EtwTraceConsumerDataTest: public EtwTraceConsumerBaseTest {
temp_file_ = temp_dir_.path().Append(L"test.etl");
}
- virtual void TearDown() {
+ void TearDown() override {
EXPECT_TRUE(base::DeleteFile(temp_file_, false));
EtwTraceConsumerBaseTest::TearDown();

Powered by Google App Engine
This is Rietveld 408576698