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/function_stub_unittest.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'chrome_frame/function_stub_unittest.cc') diff --git a/chrome_frame/function_stub_unittest.cc b/chrome_frame/function_stub_unittest.cc index 3f89bec..4ad2c31 100644 --- a/chrome_frame/function_stub_unittest.cc +++ b/chrome_frame/function_stub_unittest.cc @@ -74,15 +74,13 @@ class FunctionStubTest: public testing::Test { static uintptr_t CALLBACK FooCallback0(FunctionStubTest* test) { return test->Foo0(); } - static uintptr_t CALLBACK FooCallback1(FunctionStubTest* test, - uintptr_t arg) { + static uintptr_t CALLBACK FooCallback1(FunctionStubTest* test, uintptr_t arg) { return test->Foo1(arg); } static uintptr_t CALLBACK BarCallback0(FunctionStubTest* test) { return test->Foo0(); } - static uintptr_t CALLBACK BarCallback1(FunctionStubTest* test, - uintptr_t arg) { + static uintptr_t CALLBACK BarCallback1(FunctionStubTest* test, uintptr_t arg) { return test->Foo1(arg); } @@ -121,10 +119,10 @@ TEST_F(FunctionStubTest, Accessors) { // Check that the stub code is executable. MEMORY_BASIC_INFORMATION info = {}; - EXPECT_NE(0u, ::VirtualQuery(stub_->code(), &info, sizeof(info))); + EXPECT_NE(0, ::VirtualQuery(stub_->code(), &info, sizeof(info))); const DWORD kExecutableMask = PAGE_EXECUTE | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY; - EXPECT_NE(0u, info.Protect & kExecutableMask); + EXPECT_NE(0, info.Protect & kExecutableMask); EXPECT_EQ(argument, stub_->argument()); EXPECT_TRUE(stub_->bypass_address() != NULL); -- cgit v1.1