summaryrefslogtreecommitdiffstats
path: root/chrome/browser/visitedlink_master.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_master.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_master.cc')
-rw-r--r--chrome/browser/visitedlink_master.cc17
1 files changed, 13 insertions, 4 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;
}