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

Unified Diff: base/win/event_trace_controller_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_controller_unittest.cc
diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc
index be11128d009971c5493b20473b179c6267ff7e43..a2cd81cf7097d1427540cbe475b685fdaa6ba877 100644
--- a/base/win/event_trace_controller_unittest.cc
+++ b/base/win/event_trace_controller_unittest.cc
@@ -42,12 +42,8 @@ class TestingProvider: public EtwTraceProvider {
}
private:
- virtual void OnEventsEnabled() {
- ::SetEvent(callback_event_.Get());
- }
- virtual void PostEventsDisabled() {
- ::SetEvent(callback_event_.Get());
- }
+ void OnEventsEnabled() override { ::SetEvent(callback_event_.Get()); }
+ void PostEventsDisabled() override { ::SetEvent(callback_event_.Get()); }
ScopedHandle callback_event_;
@@ -113,7 +109,7 @@ class EtwTraceControllerTest : public testing::Test {
: session_name_(StringPrintf(L"TestSession-%d", GetCurrentProcId())) {
}
- virtual void SetUp() {
+ void SetUp() override {
EtwTraceProperties ignore;
EtwTraceController::Stop(session_name_.c_str(), &ignore);
@@ -121,7 +117,7 @@ class EtwTraceControllerTest : public testing::Test {
ASSERT_HRESULT_SUCCEEDED(::CoCreateGuid(&test_provider_));
}
- virtual void TearDown() {
+ void TearDown() override {
EtwTraceProperties prop;
EtwTraceController::Stop(session_name_.c_str(), &prop);
}

Powered by Google App Engine
This is Rietveld 408576698