[Sync] Split DirectoryChangeListener for thread-safety

chrome/browser/sync/profile_sync_service_autofill_unittest.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 <set>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task.h"
 #include "base/time.h"
+#include "base/tracked.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/engine/model_changing_syncer_command.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/autofill_change_processor.h"
 #include "chrome/browser/sync/glue/autofill_data_type_controller.h"
 #include "chrome/browser/sync/glue/autofill_model_associator.h"
 #include "chrome/browser/sync/glue/autofill_profile_change_processor.h"
 #include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"
@@ skipping 455 matching lines @@
   ProfileSyncServiceAutofillTest* test_;
   const std::vector<T>& entries_;
   bool success_;
 };
 
 // Overload write transaction to use custom NotifyTransactionComplete
 static const bool kLoggingInfo = true;
 class WriteTransactionTest: public WriteTransaction {
  public:
   WriteTransactionTest(const syncable::ScopedDirLookup& directory,
-                       WriterTag writer, const char* source_file,
-                       int line,
+                       WriterTag writer,
+                       const tracked_objects::Location& from_here,
                        scoped_ptr<WaitableEvent> *wait_for_syncapi)
-      : WriteTransaction(directory, writer, source_file, line),
+      : WriteTransaction(directory, writer, from_here),
         wait_for_syncapi_(wait_for_syncapi) { }
 
   virtual void NotifyTransactionComplete(syncable::ModelTypeBitSet types) {
     // This is where we differ. Force a thread change here, giving another
     // thread a chance to create a WriteTransaction
     (*wait_for_syncapi_)->Wait();
 
     WriteTransaction::NotifyTransactionComplete(types);
   }
 
@@ skipping 37 matching lines @@
 
     sync_pb::EntitySpecifics entity_specifics;
     entity_specifics.MutableExtension(sync_pb::autofill)->
         CopyFrom(new_autofill);
 
     {
       // Tell main thread we've started
       (*wait_for_start_)->Signal();
 
       // Create write transaction.
-      WriteTransactionTest trans(dir, UNITTEST, __FILE__, __LINE__,
+      WriteTransactionTest trans(dir, UNITTEST, FROM_HERE,
                                  wait_for_syncapi_);
 
       // Create actual entry based on autofill protobuf information.
       // Simulates effects of SyncerUtil::UpdateLocalDataFromServerData
       MutableEntry parent(&trans, GET_BY_SERVER_TAG, kAutofillTag);
       MutableEntry item(&trans, CREATE, parent.Get(syncable::ID), tag);
       ASSERT_TRUE(item.good());
       item.Put(SPECIFICS, entity_specifics);
       item.Put(SERVER_SPECIFICS, entity_specifics);
       item.Put(BASE_VERSION, 1);
@@ skipping 514 matching lines @@
   std::vector<AutofillEntry> sync_entries;
   std::vector<AutofillProfile> sync_profiles;
   ASSERT_TRUE(GetAutofillEntriesFromSyncDB(&sync_entries, &sync_profiles));
   EXPECT_EQ(3U, sync_entries.size());
   EXPECT_EQ(0U, sync_profiles.size());
   for (size_t i = 0; i < sync_entries.size(); i++) {
     VLOG(1) << "Entry " << i << ": " << sync_entries[i].key().name()
             << ", " << sync_entries[i].key().value();
   }
 }