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/browser/sync/syncable/syncable.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'chrome/browser/sync/syncable') diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc index ae0307c..01c2fc7 100644 --- a/chrome/browser/sync/syncable/syncable.cc +++ b/chrome/browser/sync/syncable/syncable.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -586,13 +586,12 @@ void Directory::VacuumAfterSaveChanges(const SaveChangesSnapshot& snapshot) { size_t num_erased = 0; kernel_->flushed_metahandles.Push(entry->ref(META_HANDLE)); num_erased = kernel_->ids_index->erase(entry); - DCHECK_EQ(1u, num_erased); + DCHECK(1 == num_erased); num_erased = kernel_->metahandles_index->erase(entry); - DCHECK_EQ(1u, num_erased); + DCHECK(1 == num_erased); - // Might not be in it - num_erased = kernel_->client_tag_index->erase(entry); - DCHECK_EQ(entry->ref(UNIQUE_CLIENT_TAG).empty(), !num_erased); + num_erased = kernel_->client_tag_index->erase(entry); // Might not be in it + DCHECK(!entry->ref(UNIQUE_CLIENT_TAG).empty() == num_erased); delete entry; } } -- cgit v1.1