summaryrefslogtreecommitdiffstats
path: root/chrome/browser/visitedlink_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 16:45:36 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 16:45:36 +0000
commit76aac1e0281a0518734c4404e9fb0814ff3c7b20 (patch)
tree0e50063deed8b1f7daaac3ca92d0826412f0aca1 /chrome/browser/visitedlink_unittest.cc
parent3bec623b6d7cd31d93bdb48e6ee6eb7fd0c79c31 (diff)
downloadchromium_src-76aac1e0281a0518734c4404e9fb0814ff3c7b20.zip
chromium_src-76aac1e0281a0518734c4404e9fb0814ff3c7b20.tar.gz
chromium_src-76aac1e0281a0518734c4404e9fb0814ff3c7b20.tar.bz2
Port visitedlink tests to Linux. Also make them pass on Linux, which
may fix the attached bug. The problem was that the debug check was in wrong place (too early, before every member was initialized), so it failed in the test. BUG=8710 Review URL: http://codereview.chromium.org/48005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/visitedlink_unittest.cc')
-rw-r--r--chrome/browser/visitedlink_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/visitedlink_unittest.cc b/chrome/browser/visitedlink_unittest.cc
index 8f59462..5c4ddce 100644
--- a/chrome/browser/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink_unittest.cc
@@ -36,7 +36,7 @@ void SynchronousBroadcastNewTableEvent(base::SharedMemory* table) {
if (table) {
for (std::vector<VisitedLinkSlave>::size_type i = 0;
i < g_slaves.size(); i++) {
- base::SharedMemoryHandle new_handle = NULL;
+ base::SharedMemoryHandle new_handle = base::SharedMemory::NULLHandle();
table->ShareToProcess(base::GetCurrentProcessHandle(), &new_handle);
g_slaves[i]->Init(new_handle);
}
@@ -103,7 +103,7 @@ class VisitedLinkTest : public testing::Test {
// Create a slave database.
VisitedLinkSlave slave;
- base::SharedMemoryHandle new_handle = NULL;
+ base::SharedMemoryHandle new_handle = base::SharedMemory::NULLHandle();
master_->ShareToProcess(base::GetCurrentProcessHandle(), &new_handle);
bool success = slave.Init(new_handle);
ASSERT_TRUE(success);
@@ -239,7 +239,7 @@ TEST_F(VisitedLinkTest, DeleteAll) {
{
VisitedLinkSlave slave;
- base::SharedMemoryHandle new_handle = NULL;
+ base::SharedMemoryHandle new_handle = base::SharedMemory::NULLHandle();
master_->ShareToProcess(base::GetCurrentProcessHandle(), &new_handle);
ASSERT_TRUE(slave.Init(new_handle));
g_slaves.push_back(&slave);
@@ -287,7 +287,7 @@ TEST_F(VisitedLinkTest, Resizing) {
// ...and a slave
VisitedLinkSlave slave;
- base::SharedMemoryHandle new_handle = NULL;
+ base::SharedMemoryHandle new_handle = base::SharedMemory::NULLHandle();
master_->ShareToProcess(base::GetCurrentProcessHandle(), &new_handle);
bool success = slave.Init(new_handle);
ASSERT_TRUE(success);