diff options
author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 20:21:16 +0000 |
---|---|---|
committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 20:21:16 +0000 |
commit | bd635c097dfc689674d6b21c006850a7b07f23f4 (patch) | |
tree | b9c8bdf9edc379e288c14f64e063e29efe7635c8 /chrome_frame/test | |
parent | 19dc5d7922dc07b61c037ebbcc86f20dad27eab2 (diff) | |
download | chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.zip chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.gz chromium_src-bd635c097dfc689674d6b21c006850a7b07f23f4.tar.bz2 |
Enable warning 4389 as an error on windows builds. This will make
windows builds more similar to linux/mac, which already treat signed/
unsigned equality comparisons as warnings (and hence errors).
BUG=44471
TEST=none
Review URL: http://codereview.chromium.org/2081007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48186 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 2 | ||||
-rw-r--r-- | chrome_frame/test/exception_barrier_unittest.cc | 6 | ||||
-rw-r--r-- | chrome_frame/test/html_util_unittests.cc | 6 | ||||
-rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 6 | ||||
-rw-r--r-- | chrome_frame/test/util_unittests.cc | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc index 80f2786..0659c9d 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_, 0); + DCHECK_EQ(process_id_to_wait_for_, 0u); 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 eeffd2a..73f006a 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(0, ::VirtualQuery(&info, &info, sizeof(info))); + ASSERT_NE(0u, ::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<UINT_PTR>(prev) & 0x00000003)); // find the module hosting the handler - ASSERT_NE(0, ::VirtualQuery(curr->handler, &info, sizeof(info))); + ASSERT_NE(0u, ::VirtualQuery(curr->handler, &info, sizeof(info))); wchar_t module_filename[MAX_PATH]; - ASSERT_NE(0, ::GetModuleFileName( + ASSERT_NE(0u, ::GetModuleFileName( reinterpret_cast<HMODULE>(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 1188482..5539e4a 100644 --- a/chrome_frame/test/html_util_unittests.cc +++ b/chrome_frame/test/html_util_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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(0, ua.length()); + EXPECT_NE(0u, 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(0, ua.length()); + EXPECT_NE(0u, 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 a3d3b99..4806865 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) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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_ == GetCurrentProcessId()) { + } else if (process_id_ == base::GetCurrentProcId()) { 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"); } - int process_id_; + base::ProcessId 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 8780d3d..81bc752 100644 --- a/chrome_frame/test/util_unittests.cc +++ b/chrome_frame/test/util_unittests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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, 0); - EXPECT_NE(low, 0); + EXPECT_NE(high, 0u); + EXPECT_NE(low, 0u); // Make sure they give the same results. FileVersionInfoWin* base_info_win = |