diff options
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_unittest.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/sync/profile_sync_service_unittest.cc b/chrome/browser/sync/profile_sync_service_unittest.cc index cf3bb78..a6f692f 100644 --- a/chrome/browser/sync/profile_sync_service_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_unittest.cc @@ -245,8 +245,8 @@ TEST_F(ProfileSyncServiceTest, JsControllerHandlersBasic) { EXPECT_TRUE(service_->sync_initialized()); EXPECT_TRUE(service_->GetBackendForTest() != NULL); - csync::JsController* js_controller = service_->GetJsController(); - StrictMock<csync::MockJsEventHandler> event_handler; + syncer::JsController* js_controller = service_->GetJsController(); + StrictMock<syncer::MockJsEventHandler> event_handler; js_controller->AddJsEventHandler(&event_handler); js_controller->RemoveJsEventHandler(&event_handler); } @@ -255,13 +255,13 @@ TEST_F(ProfileSyncServiceTest, JsControllerHandlersDelayedBackendInitialization) { StartSyncServiceAndSetInitialSyncEnded(true, false, false, true, true, false); - StrictMock<csync::MockJsEventHandler> event_handler; + StrictMock<syncer::MockJsEventHandler> event_handler; EXPECT_CALL(event_handler, HandleJsEvent(_, _)).Times(AtLeast(1)); EXPECT_EQ(NULL, service_->GetBackendForTest()); EXPECT_FALSE(service_->sync_initialized()); - csync::JsController* js_controller = service_->GetJsController(); + syncer::JsController* js_controller = service_->GetJsController(); js_controller->AddJsEventHandler(&event_handler); // Since we're doing synchronous initialization, backend should be // initialized by this call. @@ -273,16 +273,16 @@ TEST_F(ProfileSyncServiceTest, TEST_F(ProfileSyncServiceTest, JsControllerProcessJsMessageBasic) { StartSyncService(); - StrictMock<csync::MockJsReplyHandler> reply_handler; + StrictMock<syncer::MockJsReplyHandler> reply_handler; ListValue arg_list1; arg_list1.Append(Value::CreateBooleanValue(false)); - csync::JsArgList args1(&arg_list1); + syncer::JsArgList args1(&arg_list1); EXPECT_CALL(reply_handler, HandleJsReply("getNotificationState", HasArgs(args1))); { - csync::JsController* js_controller = service_->GetJsController(); + syncer::JsController* js_controller = service_->GetJsController(); js_controller->ProcessJsMessage("getNotificationState", args1, reply_handler.AsWeakHandle()); } @@ -296,16 +296,16 @@ TEST_F(ProfileSyncServiceTest, JsControllerProcessJsMessageBasicDelayedBackendInitialization) { StartSyncServiceAndSetInitialSyncEnded(true, false, false, true, true, false); - StrictMock<csync::MockJsReplyHandler> reply_handler; + StrictMock<syncer::MockJsReplyHandler> reply_handler; ListValue arg_list1; arg_list1.Append(Value::CreateBooleanValue(false)); - csync::JsArgList args1(&arg_list1); + syncer::JsArgList args1(&arg_list1); EXPECT_CALL(reply_handler, HandleJsReply("getNotificationState", HasArgs(args1))); { - csync::JsController* js_controller = service_->GetJsController(); + syncer::JsController* js_controller = service_->GetJsController(); js_controller->ProcessJsMessage("getNotificationState", args1, reply_handler.AsWeakHandle()); } |