[Sync] Split DirectoryChangeListener for thread-safety

chrome/browser/sync/profile_sync_service_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 "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/sync/glue/bookmark_data_type_controller.h"
@@ skipping 13 matching lines @@
 
 // TODO(akalin): Add tests here that exercise the whole
 // ProfileSyncService/SyncBackendHost stack while mocking out as
 // little as possible.
 
 namespace browser_sync {
 
 namespace {
 
 using testing::_;
+using testing::AnyNumber;
 using testing::AtLeast;
 using testing::AtMost;
 using testing::Return;
 using testing::StrictMock;
 
 class ProfileSyncServiceTest : public testing::Test {
  protected:
   ProfileSyncServiceTest()
       : ui_thread_(BrowserThread::UI, &ui_loop_),
         io_thread_(BrowserThread::IO) {}
@@ skipping 121 matching lines @@
   js_backend->RemoveHandler(&event_handler);
   EXPECT_EQ(NULL, test_backend->GetJsBackend()->GetParentJsEventRouter());
 }
 
 TEST_F(ProfileSyncServiceTest,
        JsFrontendHandlersDelayedBackendInitialization) {
   StartSyncServiceAndSetInitialSyncEnded(true, false, false, true);
 
   StrictMock<MockJsEventHandler> event_handler;
   EXPECT_CALL(event_handler,
+              HandleJsEvent("onTransactionStart", _)).Times(AnyNumber());
+  EXPECT_CALL(event_handler,
+              HandleJsEvent("onTransactionEnd", _)).Times(AnyNumber());
+  EXPECT_CALL(event_handler,
               HandleJsEvent("onServiceStateChanged",
                             HasDetails(JsEventDetails()))).Times(AtLeast(3));
   // For some reason, these events may or may not fire.
   //
   // TODO(akalin): Figure out exactly why there's non-determinism
   // here, and if possible remove it.
   EXPECT_CALL(event_handler, HandleJsEvent("onChangesApplied", _))
       .Times(AtMost(1));
   EXPECT_CALL(event_handler, HandleJsEvent("onChangesComplete", _))
       .Times(AtMost(1));
@@ skipping 78 matching lines @@
 
   // Never replied to.
   js_backend->ProcessMessage("notRepliedTo", args3, &event_handler);
 }
 
 TEST_F(ProfileSyncServiceTest,
        JsFrontendProcessMessageBasicDelayedBackendInitialization) {
   StartSyncServiceAndSetInitialSyncEnded(true, false, false, true);
 
   StrictMock<MockJsEventHandler> event_handler;
+  EXPECT_CALL(event_handler,
+              HandleJsEvent("onTransactionStart", _)).Times(AnyNumber());
+  EXPECT_CALL(event_handler,
+              HandleJsEvent("onTransactionEnd", _)).Times(AnyNumber());
   // For some reason, these events may or may not fire.
   EXPECT_CALL(event_handler, HandleJsEvent("onChangesApplied", _))
       .Times(AtMost(1));
   EXPECT_CALL(event_handler, HandleJsEvent("onChangesComplete", _))
       .Times(AtMost(1));
   EXPECT_CALL(event_handler, HandleJsEvent("onNotificationStateChange", _))
       .Times(AtMost(1));
 
   ListValue arg_list1;
   arg_list1.Append(Value::CreateBooleanValue(true));
@@ skipping 88 matching lines @@
   // This will still exist, but the text should have changed.
   ASSERT_TRUE(file_util::PathExists(sync_file2));
   std::string file2text;
   ASSERT_TRUE(file_util::ReadFileToString(sync_file2, &file2text));
   ASSERT_NE(file2text.compare(nonsense2), 0);
 }
 
 }  // namespace
 
 }  // namespace browser_sync