From 2fbc33967abe8fd301a1c0ce35a625ed98bf41f9 Mon Sep 17 00:00:00 2001 From: "rafaelw@chromium.org" Date: Wed, 26 May 2010 01:52:40 +0000 Subject: 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 --- chrome_frame/test/chrome_frame_test_utils.cc | 2 +- chrome_frame/test/exception_barrier_unittest.cc | 6 +++--- chrome_frame/test/html_util_unittests.cc | 6 +++--- chrome_frame/test/perf/chrome_frame_perftest.cc | 6 +++--- chrome_frame/test/util_unittests.cc | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) (limited to 'chrome_frame/test') diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 0659c9d..80f2786 100644 --- a/chrome_frame/test/chrome_frame_test_utils.cc +++ b/chrome_frame/test/chrome_frame_test_utils.cc @@ -775,7 +775,7 @@ HRESULT WebBrowserEventSink::SetWebBrowser(IWebBrowser2* web_browser2) { } HRESULT WebBrowserEventSink::CloseWebBrowser() { - DCHECK_EQ(process_id_to_wait_for_, 0u); + DCHECK_EQ(process_id_to_wait_for_, 0); if (!web_browser2_) return E_FAIL; diff --git a/chrome_frame/test/exception_barrier_unittest.cc b/chrome_frame/test/exception_barrier_unittest.cc index 73f006a..eeffd2a 100644 --- a/chrome_frame/test/exception_barrier_unittest.cc +++ b/chrome_frame/test/exception_barrier_unittest.cc @@ -29,7 +29,7 @@ void TestSEHChainSane() { MEMORY_BASIC_INFORMATION info = { 0 }; // Note that we pass the address of the info struct just as a handy // moniker to anything at all inside our stack allocation - ASSERT_NE(0u, ::VirtualQuery(&info, &info, sizeof(info))); + ASSERT_NE(0, ::VirtualQuery(&info, &info, sizeof(info))); // The lower bound of our stack. // We use the address of info as a lower bound, this assumes that if this @@ -60,9 +60,9 @@ void TestSEHChainSane() { ASSERT_EQ(0, (reinterpret_cast(prev) & 0x00000003)); // find the module hosting the handler - ASSERT_NE(0u, ::VirtualQuery(curr->handler, &info, sizeof(info))); + ASSERT_NE(0, ::VirtualQuery(curr->handler, &info, sizeof(info))); wchar_t module_filename[MAX_PATH]; - ASSERT_NE(0u, ::GetModuleFileName( + ASSERT_NE(0, ::GetModuleFileName( reinterpret_cast(info.AllocationBase), module_filename, ARRAYSIZE(module_filename))); } diff --git a/chrome_frame/test/html_util_unittests.cc b/chrome_frame/test/html_util_unittests.cc index 5539e4a..1188482 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-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. @@ -292,14 +292,14 @@ TEST_F(HtmlUtilUnittest, AddChromeFrameToUserAgentValue) { TEST_F(HtmlUtilUnittest, GetDefaultUserAgentHeaderWithCFTag) { std::string ua(http_utils::GetDefaultUserAgentHeaderWithCFTag()); - EXPECT_NE(0u, ua.length()); + EXPECT_NE(0, ua.length()); EXPECT_NE(std::string::npos, ua.find("Mozilla")); EXPECT_NE(std::string::npos, ua.find(kChromeFrameUserAgent)); } TEST_F(HtmlUtilUnittest, GetDefaultUserAgent) { std::string ua(http_utils::GetDefaultUserAgent()); - EXPECT_NE(0u, ua.length()); + EXPECT_NE(0, ua.length()); EXPECT_NE(std::string::npos, ua.find("Mozilla")); } diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 4806865..a3d3b99 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-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. #include "chrome_frame/test/perf/chrome_frame_perftest.h" @@ -508,7 +508,7 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { chrome_frame_memory_test_instance_->PrintResult( "ws_final_browser", "", trace_name + "_ws_b", working_set_size_ / 1024, "KB", false /* not important */); - } else if (process_id_ == base::GetCurrentProcId()) { + } else if (process_id_ == GetCurrentProcessId()) { chrome_frame_memory_test_instance_->PrintResult( "vm_current_process", "", trace_name + "_vm_c", virtual_size_ / 1024, "KB", false /* not important */); @@ -520,7 +520,7 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { printf("\n"); } - base::ProcessId process_id_; + int process_id_; size_t virtual_size_; size_t working_set_size_; // Set to true if this is the chrome browser process. diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc index 81bc752..8780d3d 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/chrome_frame/test/util_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-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. @@ -24,8 +24,8 @@ TEST(UtilTests, GetModuleVersionTest) { // Use the method that doesn't go to disk uint32 low = 0, high = 0; EXPECT_TRUE(GetModuleVersion(mod, &high, &low)); - EXPECT_NE(high, 0u); - EXPECT_NE(low, 0u); + EXPECT_NE(high, 0); + EXPECT_NE(low, 0); // Make sure they give the same results. FileVersionInfoWin* base_info_win = -- cgit v1.1