Revert 48186, 48196, 48198

base/event_trace_consumer_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 consumer_ base class.
 #include "base/event_trace_consumer_win.h"
 #include <list>
 #include "base/basictypes.h"
 #include "base/event_trace_controller_win.h"
 #include "base/event_trace_provider_win.h"
 #include "base/file_path.h"
@@ skipping 213 matching lines @@
 
   ASSERT_EQ(0, TestConsumer::events_.size());
 
   EtwMofEvent<1> event(kTestEventType, 1, TRACE_LEVEL_ERROR);
   EXPECT_EQ(ERROR_SUCCESS, provider.Log(&event.header));
 
   EXPECT_EQ(WAIT_OBJECT_0, ::WaitForSingleObject(TestConsumer::sank_event_,
                                                  INFINITE));
   ASSERT_HRESULT_SUCCEEDED(controller.Stop(NULL));
   ASSERT_HRESULT_SUCCEEDED(JoinConsumerThread());
-  ASSERT_NE(0u, TestConsumer::events_.size());
+  ASSERT_NE(0, TestConsumer::events_.size());
 }
 
 namespace {
 
 // We run events through a file session to assert that
 // the content comes through.
 class EtwTraceConsumerDataTest: public testing::Test {
  public:
   EtwTraceConsumerDataTest() {
   }
@@ skipping 82 matching lines @@
   PEVENT_TRACE trace = NULL;
   HRESULT hr = RoundTripEvent(&event.header, &trace);
   if (hr == E_ACCESSDENIED) {
     LOG(INFO) << "You must be an administrator to run this test on Vista";
     return;
   }
   ASSERT_TRUE(NULL != trace);
   ASSERT_EQ(sizeof(kData), trace->MofLength);
   ASSERT_STREQ(kData, reinterpret_cast<const char*>(trace->MofData));
 }