[Sync] Split DirectoryChangeListener for thread-safety

chrome/test/sync/engine/mock_connection_manager.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.
 //
 // Mock ServerConnectionManager class for use in client regression tests.
 
 #include "chrome/test/sync/engine/mock_connection_manager.h"
 
 #include <map>
 
 #include "base/stringprintf.h"
+#include "base/tracked.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/test/sync/engine/test_id_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using browser_sync::HttpResponse;
 using browser_sync::ServerConnectionManager;
 using browser_sync::ServerConnectionEventListener;
 using browser_sync::ServerConnectionEvent;
 using browser_sync::SyncerProtoUtil;
@@ skipping 68 matching lines @@
   response.Clear();
 
   ScopedDirLookup directory(directory_manager_, directory_name_);
   // For any non-AUTHENTICATE requests, a valid directory should be set up.
   // If the Directory's locked when we do this, it's a problem as in normal
   // use this function could take a while to return because it accesses the
   // network. As we can't test this we do the next best thing and hang here
   // when there's an issue.
   if (post.message_contents() != ClientToServerMessage::AUTHENTICATE) {
     CHECK(directory.good());
-    WriteTransaction wt(directory, syncable::UNITTEST, __FILE__, __LINE__);
+    WriteTransaction wt(directory, syncable::UNITTEST, FROM_HERE);
   }
 
   if (fail_next_postbuffer_) {
     fail_next_postbuffer_ = false;
     return false;
   }
 
   if (!server_reachable_) {
     params->response->server_status = HttpResponse::CONNECTION_UNAVAILABLE;
     return false;
@@ skipping 501 matching lines @@
       ServerConnectionEvent(server_status_, server_reachable_));
 }
 
 void MockConnectionManager::SetServerNotReachable() {
   server_status_ = HttpResponse::CONNECTION_UNAVAILABLE;
   server_reachable_ = false;
 
   listeners_->Notify(&ServerConnectionEventListener::OnServerConnectionEvent,
       ServerConnectionEvent(server_status_, server_reachable_));
 }