summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 09:53:03 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-23 09:53:03 +0000
commit1f55120f9703c03fdf91a6bee8912b4cb99d624a (patch)
treef6c6ea6c9669055a32930b43cb2bd46f87ad77f0 /chrome/browser
parente7139164b0665bedea422df85b27c0151b44849b (diff)
downloadchromium_src-1f55120f9703c03fdf91a6bee8912b4cb99d624a.zip
chromium_src-1f55120f9703c03fdf91a6bee8912b4cb99d624a.tar.gz
chromium_src-1f55120f9703c03fdf91a6bee8912b4cb99d624a.tar.bz2
Initialize PersistedKernelInfo member.
BUG=None TEST=None CID=14204 Review URL: http://codereview.chromium.org/6483013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/sync/syncable/syncable.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index 82a1ab4..5447cc2 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) 2011 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.
@@ -152,6 +152,8 @@ Directory::PersistedKernelInfo::PersistedKernelInfo()
reset_download_progress(ModelTypeFromInt(i));
}
autofill_migration_state = NOT_DETERMINED;
+ memset(&autofill_migration_debug_info, 0,
+ sizeof(autofill_migration_debug_info));
}
Directory::PersistedKernelInfo::~PersistedKernelInfo() {}
@@ -479,7 +481,6 @@ bool Directory::ReindexId(EntryKernel* const entry, const Id& new_id) {
void Directory::ReindexParentId(EntryKernel* const entry,
const Id& new_parent_id) {
-
ScopedKernelLock lock(this);
if (entry->ref(IS_DEL)) {
entry->put(PARENT_ID, new_parent_id);