[Sync] Split DirectoryChangeListener for thread-safety

chrome/browser/sync/engine/sync_scheduler.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/sync_scheduler.h"
 
 #include <algorithm>
 #include <cstring>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
 #include "base/tracked.h"
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/protocol/proto_enum_conversions.h"
+#include "chrome/browser/sync/util/logging.h"
 
 using base::TimeDelta;
 using base::TimeTicks;
 
 namespace browser_sync {
 
 using sessions::SyncSession;
 using sessions::SyncSessionSnapshot;
 using sessions::SyncSourceInfo;
 using syncable::ModelTypePayloadMap;
@@ skipping 74 matching lines @@
     default:
       NOTREACHED();
   }
 
   return GetUpdatesCallerInfo::UNKNOWN;
 }
 
 SyncScheduler::WaitInterval::WaitInterval(Mode mode, TimeDelta length)
     : mode(mode), had_nudge(false), length(length) { }
 
-// Helper functions/macros to do logging with a Location object.
-
-namespace {
-
-bool VlogIsOn(const tracked_objects::Location& from_here,
-              int verbose_level) {
-  return (verbose_level <=
-          logging::GetVlogLevelHelper(
-              from_here.file_name(), ::strlen(from_here.file_name())));
-}
-
-}  // namespace
-
-#define VLOG_LOC_STREAM(from_here, verbose_level)                       \
-  logging::LogMessage(from_here.file_name(), from_here.line_number(),   \
-                      -verbose_level).stream()
-
-#define VLOG_LOC(from_here, verbose_level)                              \
-  LAZY_STREAM(VLOG_LOC_STREAM(from_here, verbose_level),                \
-              VLOG_IS_ON(verbose_level) || VlogIsOn(from_here, verbose_level))
-
 // Helper macros to log with the syncer thread name; useful when there
 // are multiple syncer threads involved.
 
 #define SLOG(severity) LOG(severity) << name_ << ": "
 
 #define SVLOG(verbose_level) VLOG(verbose_level) << name_ << ": "
 
 #define SVLOG_LOC(from_here, verbose_level)             \
   VLOG_LOC(from_here, verbose_level) << name_ << ": "
 
@@ skipping 908 matching lines @@
 
 #undef SLOG
 
 #undef VLOG_LOC
 
 #undef VLOG_LOC_STREAM
 
 #undef ENUM_CASE
 
 }  // browser_sync