Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(68)

Unified Diff: chrome/browser/sync/engine/syncer_util.cc

Issue 7190001: [Sync] Split DirectoryChangeListener for thread-safety (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix copyright Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/engine/syncer_unittest.cc ('k') | chrome/browser/sync/engine/verify_updates_command.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/syncer_util.cc
diff --git a/chrome/browser/sync/engine/syncer_util.cc b/chrome/browser/sync/engine/syncer_util.cc
index 23ebff13f582505d5526f927706465a0e453dac0..d61059cb8130435e7a8b33f33965576f7b316540 100644
--- a/chrome/browser/sync/engine/syncer_util.cc
+++ b/chrome/browser/sync/engine/syncer_util.cc
@@ -9,6 +9,7 @@
#include <string>
#include <vector>
+#include "base/tracked.h"
#include "chrome/browser/sync/engine/conflict_resolver.h"
#include "chrome/browser/sync/engine/syncer_proto_util.h"
#include "chrome/browser/sync/engine/syncer_types.h"
@@ -659,7 +660,7 @@ void SyncerUtil::MarkDeletedChildrenSynced(
return;
Directory::UnsyncedMetaHandles handles;
{
- ReadTransaction trans(dir, __FILE__, __LINE__);
+ ReadTransaction trans(dir, FROM_HERE);
dir->GetUnsyncedMetaHandles(&trans, &handles);
}
if (handles.empty())
@@ -667,7 +668,7 @@ void SyncerUtil::MarkDeletedChildrenSynced(
Directory::UnsyncedMetaHandles::iterator it;
for (it = handles.begin() ; it != handles.end() ; ++it) {
// Single transaction / entry we deal with.
- WriteTransaction trans(dir, SYNCER, __FILE__, __LINE__);
+ WriteTransaction trans(dir, SYNCER, FROM_HERE);
MutableEntry entry(&trans, GET_BY_HANDLE, *it);
if (!entry.Get(IS_UNSYNCED) || !entry.Get(IS_DEL))
continue;
« no previous file with comments | « chrome/browser/sync/engine/syncer_unittest.cc ('k') | chrome/browser/sync/engine/verify_updates_command.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698