2 files changed, 17 insertions, 8 deletions
diff --git a/chrome/browser/visitedlink_master.cc b/chrome/browser/visitedlink_master.cc
index e45c059..09a3bee 100644
--- a/chrome/browser/visitedlink_master.cc
+++ b/chrome/browser/visitedlink_master.cc
@@ -582,6 +582,10 @@ bool VisitedLinkMaster::InitFromFile() {
   }
   used_items_ = used_count;
 
+#ifndef NDEBUG
+  DebugValidate();
+#endif
+
   file_ = file_closer.release();
   return true;
 }
@@ -597,6 +601,10 @@ bool VisitedLinkMaster::InitFromScratch(bool suppress_rebuild) {
   if (!CreateURLTable(table_size, true))
     return false;
 
+#ifndef NDEBUG
+  DebugValidate();
+#endif
+
   if (suppress_rebuild) {
     // When we disallow rebuilds (normally just unit tests), just use the
     // current empty table.
@@ -713,10 +721,6 @@ bool VisitedLinkMaster::CreateURLTable(int32 num_entries, bool init_to_empty) {
   hash_table_ = reinterpret_cast<Fingerprint*>(
       static_cast<char*>(shared_memory_->memory()) + sizeof(SharedHeader));
 
-#ifndef NDEBUG
-  DebugValidate();
-#endif
-
   return true;
 }
 
@@ -731,6 +735,11 @@ bool VisitedLinkMaster::BeginReplaceURLTable(int32 num_entries) {
     table_length_ = old_table_length;
     return false;
   }
+
+#ifndef NDEBUG
+  DebugValidate();
+#endif
+
   return true;
 }
 
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);