From a94275402997c11dd2e778633dacf4b7e630a35d Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Fri, 22 Oct 2010 13:02:20 +0100
Subject: Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
---
 WebKit/chromium/tests/ArenaTestHelpers.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'WebKit/chromium/tests/ArenaTestHelpers.h')

diff --git a/WebKit/chromium/tests/ArenaTestHelpers.h b/WebKit/chromium/tests/ArenaTestHelpers.h
index 87f827d..70936e5 100644
--- a/WebKit/chromium/tests/ArenaTestHelpers.h
+++ b/WebKit/chromium/tests/ArenaTestHelpers.h
@@ -28,6 +28,7 @@
 
 #include "PODArena.h"
 #include <gtest/gtest.h>
+#include <wtf/NotFound.h>
 #include <wtf/Vector.h>
 
 namespace WebCore {
@@ -52,7 +53,7 @@ public:
     virtual void free(void* ptr)
     {
         size_t slot = m_allocatedRegions.find(ptr);
-        ASSERT_GE(slot, 0);
+        ASSERT_NE(slot, notFound);
         m_allocatedRegions.remove(slot);
         PODArena::FastMallocAllocator::free(ptr);
     }
-- 
cgit v1.1