Update from https://crrev.com/327068

base/trace_event/trace_event_win_unittest.cc

Index: base/trace_event/trace_event_win_unittest.cc
diff --git a/base/trace_event/trace_event_win_unittest.cc b/base/trace_event/trace_event_win_unittest.cc
index 7f1004ea9b3f2cecae0206ad604b1260e1660d02..d4dc8542c30ae326782b9c729d7df3d6f4d81081 100644
--- a/base/trace_event/trace_event_win_unittest.cc
+++ b/base/trace_event/trace_event_win_unittest.cc
@@ -92,7 +92,7 @@ class TraceEventWinTest: public testing::Test {
   TraceEventWinTest() {
   }
 
-  void SetUp() {
+  void SetUp() override {
     bool is_xp = win::GetVersion() < base::win::VERSION_VISTA;
 
     if (is_xp) {
@@ -151,7 +151,7 @@ class TraceEventWinTest: public testing::Test {
     EXPECT_TRUE(tracelog->IsTracing());
   }
 
-  void TearDown() {
+  void TearDown() override {
     EtwTraceProperties prop;
     if (controller_.session() != 0)
       EXPECT_HRESULT_SUCCEEDED(controller_.Stop(&prop));