OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/extensions/extension_service_unittest.h" | 5 #include "chrome/browser/extensions/extension_service_unittest.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 5716 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5727 | 5727 |
5728 syncer::FakeSyncChangeProcessor processor; | 5728 syncer::FakeSyncChangeProcessor processor; |
5729 extension_sync_service_->MergeDataAndStartSyncing( | 5729 extension_sync_service_->MergeDataAndStartSyncing( |
5730 syncer::EXTENSIONS, | 5730 syncer::EXTENSIONS, |
5731 syncer::SyncDataList(), | 5731 syncer::SyncDataList(), |
5732 scoped_ptr<syncer::SyncChangeProcessor>( | 5732 scoped_ptr<syncer::SyncChangeProcessor>( |
5733 new syncer::FakeSyncChangeProcessor), | 5733 new syncer::FakeSyncChangeProcessor), |
5734 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); | 5734 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); |
5735 | 5735 |
5736 UninstallExtension(good_crx, false); | 5736 UninstallExtension(good_crx, false); |
5737 EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx)); | 5737 EXPECT_TRUE(ExtensionPrefs::Get(profile_.get()) |
| 5738 ->IsExternalExtensionUninstalled(good_crx)); |
5738 | 5739 |
5739 sync_pb::EntitySpecifics specifics; | 5740 sync_pb::EntitySpecifics specifics; |
5740 sync_pb::AppSpecifics* app_specifics = specifics.mutable_app(); | 5741 sync_pb::AppSpecifics* app_specifics = specifics.mutable_app(); |
5741 sync_pb::ExtensionSpecifics* extension_specifics = | 5742 sync_pb::ExtensionSpecifics* extension_specifics = |
5742 app_specifics->mutable_extension(); | 5743 app_specifics->mutable_extension(); |
5743 extension_specifics->set_id(good_crx); | 5744 extension_specifics->set_id(good_crx); |
5744 extension_specifics->set_version("1.0"); | 5745 extension_specifics->set_version("1.0"); |
5745 extension_specifics->set_enabled(true); | 5746 extension_specifics->set_enabled(true); |
5746 | 5747 |
5747 syncer::SyncData sync_data = | 5748 syncer::SyncData sync_data = |
5748 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); | 5749 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); |
5749 syncer::SyncChange sync_change(FROM_HERE, | 5750 syncer::SyncChange sync_change(FROM_HERE, |
5750 syncer::SyncChange::ACTION_UPDATE, | 5751 syncer::SyncChange::ACTION_UPDATE, |
5751 sync_data); | 5752 sync_data); |
5752 syncer::SyncChangeList list(1); | 5753 syncer::SyncChangeList list(1); |
5753 list[0] = sync_change; | 5754 list[0] = sync_change; |
5754 | 5755 |
5755 extension_sync_service_->ProcessSyncChanges(FROM_HERE, list); | 5756 extension_sync_service_->ProcessSyncChanges(FROM_HERE, list); |
5756 EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx)); | 5757 EXPECT_TRUE(ExtensionPrefs::Get(profile_.get()) |
| 5758 ->IsExternalExtensionUninstalled(good_crx)); |
5757 } | 5759 } |
5758 | 5760 |
5759 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { | 5761 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { |
5760 InitializeEmptyExtensionService(); | 5762 InitializeEmptyExtensionService(); |
5761 InitializeExtensionSyncService(); | 5763 InitializeExtensionSyncService(); |
5762 const Extension* app = | 5764 const Extension* app = |
5763 PackAndInstallCRX(data_dir_.AppendASCII("app"), INSTALL_NEW); | 5765 PackAndInstallCRX(data_dir_.AppendASCII("app"), INSTALL_NEW); |
5764 ASSERT_TRUE(app); | 5766 ASSERT_TRUE(app); |
5765 ASSERT_TRUE(app->is_app()); | 5767 ASSERT_TRUE(app->is_app()); |
5766 | 5768 |
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
6948 // ReconcileKnownDisabled(). | 6950 // ReconcileKnownDisabled(). |
6949 service_->EnableExtension(good2); | 6951 service_->EnableExtension(good2); |
6950 service_->ReconcileKnownDisabled(); | 6952 service_->ReconcileKnownDisabled(); |
6951 expected_extensions.insert(good2); | 6953 expected_extensions.insert(good2); |
6952 expected_disabled_extensions.erase(good2); | 6954 expected_disabled_extensions.erase(good2); |
6953 | 6955 |
6954 EXPECT_EQ(expected_extensions, registry_->enabled_extensions().GetIDs()); | 6956 EXPECT_EQ(expected_extensions, registry_->enabled_extensions().GetIDs()); |
6955 EXPECT_EQ(expected_disabled_extensions, | 6957 EXPECT_EQ(expected_disabled_extensions, |
6956 registry_->disabled_extensions().GetIDs()); | 6958 registry_->disabled_extensions().GetIDs()); |
6957 } | 6959 } |
OLD | NEW |