| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/managed/managed_user_test_base.h" | 5 #include "chrome/browser/chromeos/login/managed/managed_user_test_base.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 namespace { | 50 namespace { |
| 51 | 51 |
| 52 const char kCurrentPage[] = "$('managed-user-creation').currentPage_"; | 52 const char kCurrentPage[] = "$('managed-user-creation').currentPage_"; |
| 53 } | 53 } |
| 54 | 54 |
| 55 ManagedUsersSyncTestAdapter::ManagedUsersSyncTestAdapter(Profile* profile) | 55 ManagedUsersSyncTestAdapter::ManagedUsersSyncTestAdapter(Profile* profile) |
| 56 : processor_(), next_sync_data_id_(0) { | 56 : processor_(), next_sync_data_id_(0) { |
| 57 service_ = ManagedUserSyncServiceFactory::GetForProfile(profile); | 57 service_ = ManagedUserSyncServiceFactory::GetForProfile(profile); |
| 58 processor_ = new syncer::FakeSyncChangeProcessor(); | 58 processor_ = new syncer::FakeSyncChangeProcessor(); |
| 59 service_->MergeDataAndStartSyncing( | 59 service_->MergeDataAndStartSyncing( |
| 60 syncer::MANAGED_USERS, | 60 syncer::SUPERVISED_USERS, |
| 61 syncer::SyncDataList(), | 61 syncer::SyncDataList(), |
| 62 scoped_ptr<syncer::SyncChangeProcessor>(processor_), | 62 scoped_ptr<syncer::SyncChangeProcessor>(processor_), |
| 63 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock)); | 63 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock)); |
| 64 } | 64 } |
| 65 | 65 |
| 66 scoped_ptr< ::sync_pb::ManagedUserSpecifics> | 66 scoped_ptr< ::sync_pb::ManagedUserSpecifics> |
| 67 ManagedUsersSyncTestAdapter::GetFirstChange() { | 67 ManagedUsersSyncTestAdapter::GetFirstChange() { |
| 68 scoped_ptr< ::sync_pb::ManagedUserSpecifics> result( | 68 scoped_ptr< ::sync_pb::ManagedUserSpecifics> result( |
| 69 new ::sync_pb::ManagedUserSpecifics); | 69 new ::sync_pb::ManagedUserSpecifics); |
| 70 CHECK(HasChanges()) | 70 CHECK(HasChanges()) |
| 71 << "GetFirstChange() should only be callled if HasChanges() is true"; | 71 << "GetFirstChange() should only be callled if HasChanges() is true"; |
| 72 const syncer::SyncData& data = processor_->changes().front().sync_data(); | 72 const syncer::SyncData& data = processor_->changes().front().sync_data(); |
| 73 EXPECT_EQ(syncer::MANAGED_USERS, data.GetDataType()); | 73 EXPECT_EQ(syncer::SUPERVISED_USERS, data.GetDataType()); |
| 74 result->CopyFrom(data.GetSpecifics().managed_user()); | 74 result->CopyFrom(data.GetSpecifics().managed_user()); |
| 75 return result.Pass(); | 75 return result.Pass(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 void ManagedUsersSyncTestAdapter::AddChange( | 78 void ManagedUsersSyncTestAdapter::AddChange( |
| 79 const ::sync_pb::ManagedUserSpecifics& proto, | 79 const ::sync_pb::ManagedUserSpecifics& proto, |
| 80 bool update) { | 80 bool update) { |
| 81 sync_pb::EntitySpecifics specifics; | 81 sync_pb::EntitySpecifics specifics; |
| 82 | 82 |
| 83 specifics.mutable_managed_user()->CopyFrom(proto); | 83 specifics.mutable_managed_user()->CopyFrom(proto); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 99 service_->ProcessSyncChanges(FROM_HERE, change_list); | 99 service_->ProcessSyncChanges(FROM_HERE, change_list); |
| 100 } | 100 } |
| 101 | 101 |
| 102 ManagedUsersSharedSettingsSyncTestAdapter:: | 102 ManagedUsersSharedSettingsSyncTestAdapter:: |
| 103 ManagedUsersSharedSettingsSyncTestAdapter(Profile* profile) | 103 ManagedUsersSharedSettingsSyncTestAdapter(Profile* profile) |
| 104 : processor_(), next_sync_data_id_(0) { | 104 : processor_(), next_sync_data_id_(0) { |
| 105 service_ = | 105 service_ = |
| 106 ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile); | 106 ManagedUserSharedSettingsServiceFactory::GetForBrowserContext(profile); |
| 107 processor_ = new syncer::FakeSyncChangeProcessor(); | 107 processor_ = new syncer::FakeSyncChangeProcessor(); |
| 108 service_->MergeDataAndStartSyncing( | 108 service_->MergeDataAndStartSyncing( |
| 109 syncer::MANAGED_USER_SHARED_SETTINGS, | 109 syncer::SUPERVISED_USER_SHARED_SETTINGS, |
| 110 syncer::SyncDataList(), | 110 syncer::SyncDataList(), |
| 111 scoped_ptr<syncer::SyncChangeProcessor>(processor_), | 111 scoped_ptr<syncer::SyncChangeProcessor>(processor_), |
| 112 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock)); | 112 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock)); |
| 113 } | 113 } |
| 114 | 114 |
| 115 scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> | 115 scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> |
| 116 ManagedUsersSharedSettingsSyncTestAdapter::GetFirstChange() { | 116 ManagedUsersSharedSettingsSyncTestAdapter::GetFirstChange() { |
| 117 scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> result( | 117 scoped_ptr< ::sync_pb::ManagedUserSharedSettingSpecifics> result( |
| 118 new ::sync_pb::ManagedUserSharedSettingSpecifics); | 118 new ::sync_pb::ManagedUserSharedSettingSpecifics); |
| 119 CHECK(HasChanges()) | 119 CHECK(HasChanges()) |
| 120 << "GetFirstChange() should only be callled if HasChanges() is true"; | 120 << "GetFirstChange() should only be callled if HasChanges() is true"; |
| 121 const syncer::SyncData& data = processor_->changes().front().sync_data(); | 121 const syncer::SyncData& data = processor_->changes().front().sync_data(); |
| 122 EXPECT_EQ(syncer::MANAGED_USER_SHARED_SETTINGS, data.GetDataType()); | 122 EXPECT_EQ(syncer::SUPERVISED_USER_SHARED_SETTINGS, data.GetDataType()); |
| 123 result->CopyFrom(data.GetSpecifics().managed_user_shared_setting()); | 123 result->CopyFrom(data.GetSpecifics().managed_user_shared_setting()); |
| 124 return result.Pass(); | 124 return result.Pass(); |
| 125 } | 125 } |
| 126 | 126 |
| 127 void ManagedUsersSharedSettingsSyncTestAdapter::AddChange( | 127 void ManagedUsersSharedSettingsSyncTestAdapter::AddChange( |
| 128 const ::sync_pb::ManagedUserSharedSettingSpecifics& proto, | 128 const ::sync_pb::ManagedUserSharedSettingSpecifics& proto, |
| 129 bool update) { | 129 bool update) { |
| 130 sync_pb::EntitySpecifics specifics; | 130 sync_pb::EntitySpecifics specifics; |
| 131 | 131 |
| 132 specifics.mutable_managed_user_shared_setting()->CopyFrom(proto); | 132 specifics.mutable_managed_user_shared_setting()->CopyFrom(proto); |
| (...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 // Confirm deletion. | 425 // Confirm deletion. |
| 426 JSEval(StringPrintf( | 426 JSEval(StringPrintf( |
| 427 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()", | 427 "$('pod-row').pods[%d].querySelector('.remove-warning-button').click()", |
| 428 user_index)); | 428 user_index)); |
| 429 | 429 |
| 430 // Make sure there is no supervised user in list. | 430 // Make sure there is no supervised user in list. |
| 431 ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size()); | 431 ASSERT_EQ(original_user_count - 1, UserManager::Get()->GetUsers().size()); |
| 432 } | 432 } |
| 433 | 433 |
| 434 } // namespace chromeos | 434 } // namespace chromeos |
| OLD | NEW |