Revert 48186, 48196, 48198

base/event_trace_controller_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 controller.
 #include "base/event_trace_controller_win.h"
 #include "base/event_trace_provider_win.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
@@ skipping 43 matching lines @@
 
 TEST(EtwTraceTest, Cleanup) {
   // Clean up potential leftover sessions from previous unsuccessful runs.
   EtwTraceController::Stop(kTestSessionName, NULL);
 }
 
 TEST(EtwTracePropertiesTest, Initialization) {
   EtwTraceProperties prop;
 
   EVENT_TRACE_PROPERTIES* p = prop.get();
-  EXPECT_NE(0u, p->Wnode.BufferSize);
-  EXPECT_EQ(0u, p->Wnode.ProviderId);
-  EXPECT_EQ(0u, p->Wnode.HistoricalContext);
+  EXPECT_NE(0, p->Wnode.BufferSize);
+  EXPECT_EQ(0, p->Wnode.ProviderId);
+  EXPECT_EQ(0, p->Wnode.HistoricalContext);
 
   EXPECT_TRUE(kGuidNull == p->Wnode.Guid);
   EXPECT_EQ(0, p->Wnode.ClientContext);
   EXPECT_EQ(WNODE_FLAG_TRACED_GUID, p->Wnode.Flags);
 
   EXPECT_EQ(0, p->BufferSize);
   EXPECT_EQ(0, p->MinimumBuffers);
   EXPECT_EQ(0, p->MaximumBuffers);
   EXPECT_EQ(0, p->MaximumFileSize);
   EXPECT_EQ(0, p->LogFileMode);
   EXPECT_EQ(0, p->FlushTimer);
   EXPECT_EQ(0, p->EnableFlags);
   EXPECT_EQ(0, p->AgeLimit);
 
   EXPECT_EQ(0, p->NumberOfBuffers);
   EXPECT_EQ(0, p->FreeBuffers);
   EXPECT_EQ(0, p->EventsLost);
   EXPECT_EQ(0, p->BuffersWritten);
   EXPECT_EQ(0, p->LogBuffersLost);
   EXPECT_EQ(0, p->RealTimeBuffersLost);
   EXPECT_EQ(0, p->LoggerThreadId);
-  EXPECT_NE(0u, p->LogFileNameOffset);
-  EXPECT_NE(0u, p->LoggerNameOffset);
+  EXPECT_NE(0, p->LogFileNameOffset);
+  EXPECT_NE(0, p->LoggerNameOffset);
 }
 
 TEST(EtwTracePropertiesTest, Strings) {
   EtwTraceProperties prop;
 
   ASSERT_STREQ(L"", prop.GetLoggerFileName());
   ASSERT_STREQ(L"", prop.GetLoggerName());
 
   std::wstring name(1023, L'A');
   ASSERT_HRESULT_SUCCEEDED(prop.SetLoggerFileName(name.c_str()));
@@ skipping 93 matching lines @@
   EXPECT_EQ(kTestProviderFlags, provider.enable_flags());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
 
   provider.WaitForCallback();
 
   // Session should have wound down.
   EXPECT_EQ(0, provider.enable_level());
   EXPECT_EQ(0, provider.enable_flags());
 }