Revert 48186, 48196, 48198

base/event_trace_provider_win_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Unit tests for event trace provider.
 #include "base/event_trace_provider_win.h"
 #include <new>
 #include "testing/gtest/include/gtest/gtest.h"
 #include <initguid.h>  // NOLINT - has to be last
 
 namespace {
@@ skipping 69 matching lines @@
 
   ASSERT_EQ(ERROR_SUCCESS, provider.Register());
   EXPECT_NE(NULL, provider.registration_handle());
   ASSERT_EQ(ERROR_SUCCESS, provider.Unregister());
   EXPECT_EQ(NULL, provider.registration_handle());
 }
 
 TEST(EtwTraceProviderTest, RegisterWithNoNameFails) {
   EtwTraceProvider provider;
 
-  EXPECT_TRUE(provider.Register() != ERROR_SUCCESS);
+  EXPECT_NE(ERROR_SUCCESS, provider.Register());
 }
 
 TEST(EtwTraceProviderTest, Enable) {
   EtwTraceProvider provider(kTestProvider);
 
   ASSERT_EQ(ERROR_SUCCESS, provider.Register());
   EXPECT_NE(NULL, provider.registration_handle());
 
   // No session so far.
   EXPECT_EQ(NULL, provider.session_handle());
   EXPECT_EQ(0, provider.enable_flags());
   EXPECT_EQ(0, provider.enable_level());
 
   ASSERT_EQ(ERROR_SUCCESS, provider.Unregister());
   EXPECT_EQ(NULL, provider.registration_handle());
 }