diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-26 01:52:40 +0000 |
| commit | 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 (patch) | |
| tree | 2993e976c8470926d9e7f46a1da099c6045eecde /base/event_trace_controller_win_unittest.cc | |
| parent | b33f1d943fd420857d9c5988ce1f4598f9a8765a (diff) | |
| download | chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.zip chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.gz chromium_src-2fbc33967abe8fd301a1c0ce35a625ed98bf41f9.tar.bz2 | |
Revert "Another dependency the bbot missed!!!"
This reverts commit 161f7fd3bdd425167af9fe26fdc5373a2ff44c98.
Revert "Missed a file as part of checkin for r48186"
This reverts commit cff86beba5938209393a6c3bccced62a7f3ff36b.
Revert "Enable warning 4389 as an error on windows builds. This will make"
This reverts commit c78936bcfc65b98edf288191d927a495b0364621.
TBR=mbelshe
Review URL: http://codereview.chromium.org/2253001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/event_trace_controller_win_unittest.cc')
| -rw-r--r-- | base/event_trace_controller_win_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/event_trace_controller_win_unittest.cc b/base/event_trace_controller_win_unittest.cc index 06170de..f688d48 100644 --- a/base/event_trace_controller_win_unittest.cc +++ b/base/event_trace_controller_win_unittest.cc @@ -1,4 +1,4 @@ -// 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. // @@ -62,9 +62,9 @@ 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); @@ -86,8 +86,8 @@ TEST(EtwTracePropertiesTest, Initialization) { 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) { |