Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9266)

Unified Diff: chrome/browser/sync/profile_sync_service_unittest.cc

Issue 7190001: [Sync] Split DirectoryChangeListener for thread-safety (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix copyright Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/profile_sync_service_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc
index c7a335bd7fd19a7b9a175800474aebe0cc4303d4..aaa643a8837799dc1a704c20c98870ce3b1b8504 100644
--- a/chrome/browser/sync/profile_sync_service_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_unittest.cc
@@ -31,6 +31,7 @@ namespace browser_sync {
namespace {
using testing::_;
+using testing::AnyNumber;
using testing::AtLeast;
using testing::AtMost;
using testing::Return;
@@ -172,6 +173,10 @@ TEST_F(ProfileSyncServiceTest,
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.
@@ -270,6 +275,10 @@ TEST_F(ProfileSyncServiceTest,
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));
« no previous file with comments | « chrome/browser/sync/profile_sync_service_autofill_unittest.cc ('k') | chrome/browser/sync/sessions/sync_session_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698