[Sync] Split DirectoryChangeListener for thread-safety

chrome/browser/sync/engine/verify_updates_command_unittest.cc

-// 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.
 
+#include "base/tracked.h"
 #include "chrome/browser/sync/engine/verify_updates_command.h"
 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
 #include "chrome/browser/sync/sessions/sync_session.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/engine/mock_model_safe_workers.h"
 #include "chrome/browser/sync/syncable/syncable.h"
 #include "chrome/browser/sync/syncable/syncable_id.h"
 #include "chrome/test/sync/engine/syncer_command_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 21 matching lines @@
     (*mutable_routing_info())[syncable::BOOKMARKS] = GROUP_UI;
     (*mutable_routing_info())[syncable::AUTOFILL] = GROUP_DB;
     SyncerCommandTest::SetUp();
   }
 
   void CreateLocalItem(const std::string& item_id,
                        const std::string& parent_id,
                        const syncable::ModelType& type) {
     ScopedDirLookup dir(syncdb()->manager(), syncdb()->name());
     ASSERT_TRUE(dir.good());
-    WriteTransaction trans(dir, UNITTEST, __FILE__, __LINE__);
+    WriteTransaction trans(dir, UNITTEST, FROM_HERE);
     MutableEntry entry(&trans, syncable::CREATE_NEW_UPDATE_ITEM,
         Id::CreateFromServerId(item_id));
     ASSERT_TRUE(entry.good());
 
     entry.Put(syncable::BASE_VERSION, 1);
     entry.Put(syncable::SERVER_VERSION, 1);
     entry.Put(syncable::NON_UNIQUE_NAME, item_id);
     entry.Put(syncable::PARENT_ID, Id::CreateFromServerId(parent_id));
     sync_pb::EntitySpecifics default_specifics;
     AddDefaultExtensionValue(type, &default_specifics);
@@ skipping 41 matching lines @@
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_DB);
     EXPECT_EQ(1, status->update_progress().VerifiedUpdatesSize());
   }
   {
     sessions::ScopedModelSafeGroupRestriction r(status, GROUP_PASSIVE);
     EXPECT_EQ(0, status->update_progress().VerifiedUpdatesSize());
   }
 }
 
 }