[Sync] Split DirectoryChangeListener for thread-safety

chrome/browser/sync/engine/conflict_resolver.cc

 // 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.
 
 #include "chrome/browser/sync/engine/conflict_resolver.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 
 #include "base/metrics/histogram.h"
+#include "base/tracked.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_util.h"
 #include "chrome/browser/sync/protocol/service_constants.h"
 #include "chrome/browser/sync/sessions/status_controller.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/common/deprecated/event_sys-inl.h"
 
 using std::map;
 using std::set;
@@ skipping 403 matching lines @@
   UMA_HISTOGRAM_COUNTS("Sync.SyncerConflictStuck", 1);
 
   return true;
   // TODO(sync): If we're stuck for a while we need to alert the user, clear
   // cache or reset syncing. At the very least we should stop trying something
   // that's obviously not working.
 }
 
 bool ConflictResolver::ResolveSimpleConflicts(const ScopedDirLookup& dir,
                                               StatusController* status) {
-  WriteTransaction trans(dir, syncable::SYNCER, __FILE__, __LINE__);
+  WriteTransaction trans(dir, syncable::SYNCER, FROM_HERE);
   bool forward_progress = false;
   const ConflictProgress& progress = status->conflict_progress();
   // First iterate over simple conflict items (those that belong to no set).
   set<Id>::const_iterator conflicting_item_it;
   for (conflicting_item_it = progress.ConflictingItemsBeginConst();
        conflicting_item_it != progress.ConflictingItemsEnd();
        ++conflicting_item_it) {
     Id id = *conflicting_item_it;
     map<Id, ConflictSet*>::const_iterator item_set_it =
         progress.IdToConflictSetFind(id);
@@ skipping 24 matching lines @@
   }
   return forward_progress;
 }
 
 bool ConflictResolver::ResolveConflicts(const ScopedDirLookup& dir,
                                         StatusController* status) {
   const ConflictProgress& progress = status->conflict_progress();
   bool rv = false;
   if (ResolveSimpleConflicts(dir, status))
     rv = true;
-  WriteTransaction trans(dir, syncable::SYNCER, __FILE__, __LINE__);
+  WriteTransaction trans(dir, syncable::SYNCER, FROM_HERE);
   set<ConflictSet*>::const_iterator set_it;
   for (set_it = progress.ConflictSetsBegin();
        set_it != progress.ConflictSetsEnd();
        set_it++) {
     ConflictSet* conflict_set = *set_it;
     ConflictSetCountMapKey key = GetSetKey(conflict_set);
     conflict_set_count_map_[key] += 2;
     int conflict_count = conflict_set_count_map_[key];
     // Keep a metric for new sets.
     if (2 == conflict_count) {
@@ skipping 22 matching lines @@
       conflict_set_count_map_.erase(i++);
       // METRIC self resolved conflict sets ++.
     } else {
       ++i;
     }
   }
   return rv;
 }
 
 }  // namespace browser_sync