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

Side by Side Diff: chrome/browser/extensions/extension_service_unittest.cc

Issue 195813007: Remove ExtensionService::IsExternalExtensionUninstalled() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Latest master Created 6 years, 9 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 unified diff | Download patch
OLDNEW
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 5738 matching lines...) Expand 10 before | Expand all | Expand 10 after
5749 5749
5750 syncer::FakeSyncChangeProcessor processor; 5750 syncer::FakeSyncChangeProcessor processor;
5751 extension_sync_service_->MergeDataAndStartSyncing( 5751 extension_sync_service_->MergeDataAndStartSyncing(
5752 syncer::EXTENSIONS, 5752 syncer::EXTENSIONS,
5753 syncer::SyncDataList(), 5753 syncer::SyncDataList(),
5754 scoped_ptr<syncer::SyncChangeProcessor>( 5754 scoped_ptr<syncer::SyncChangeProcessor>(
5755 new syncer::FakeSyncChangeProcessor), 5755 new syncer::FakeSyncChangeProcessor),
5756 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock())); 5756 scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
5757 5757
5758 UninstallExtension(good_crx, false); 5758 UninstallExtension(good_crx, false);
5759 EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx)); 5759 EXPECT_TRUE(ExtensionPrefs::Get(profile_.get())
5760 ->IsExternalExtensionUninstalled(good_crx));
5760 5761
5761 sync_pb::EntitySpecifics specifics; 5762 sync_pb::EntitySpecifics specifics;
5762 sync_pb::AppSpecifics* app_specifics = specifics.mutable_app(); 5763 sync_pb::AppSpecifics* app_specifics = specifics.mutable_app();
5763 sync_pb::ExtensionSpecifics* extension_specifics = 5764 sync_pb::ExtensionSpecifics* extension_specifics =
5764 app_specifics->mutable_extension(); 5765 app_specifics->mutable_extension();
5765 extension_specifics->set_id(good_crx); 5766 extension_specifics->set_id(good_crx);
5766 extension_specifics->set_version("1.0"); 5767 extension_specifics->set_version("1.0");
5767 extension_specifics->set_enabled(true); 5768 extension_specifics->set_enabled(true);
5768 5769
5769 syncer::SyncData sync_data = 5770 syncer::SyncData sync_data =
5770 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics); 5771 syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
5771 syncer::SyncChange sync_change(FROM_HERE, 5772 syncer::SyncChange sync_change(FROM_HERE,
5772 syncer::SyncChange::ACTION_UPDATE, 5773 syncer::SyncChange::ACTION_UPDATE,
5773 sync_data); 5774 sync_data);
5774 syncer::SyncChangeList list(1); 5775 syncer::SyncChangeList list(1);
5775 list[0] = sync_change; 5776 list[0] = sync_change;
5776 5777
5777 extension_sync_service_->ProcessSyncChanges(FROM_HERE, list); 5778 extension_sync_service_->ProcessSyncChanges(FROM_HERE, list);
5778 EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx)); 5779 EXPECT_TRUE(ExtensionPrefs::Get(profile_.get())
5780 ->IsExternalExtensionUninstalled(good_crx));
5779 } 5781 }
5780 5782
5781 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) { 5783 TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
5782 InitializeEmptyExtensionService(); 5784 InitializeEmptyExtensionService();
5783 InitializeExtensionSyncService(); 5785 InitializeExtensionSyncService();
5784 const Extension* app = 5786 const Extension* app =
5785 PackAndInstallCRX(data_dir_.AppendASCII("app"), INSTALL_NEW); 5787 PackAndInstallCRX(data_dir_.AppendASCII("app"), INSTALL_NEW);
5786 ASSERT_TRUE(app); 5788 ASSERT_TRUE(app);
5787 ASSERT_TRUE(app->is_app()); 5789 ASSERT_TRUE(app->is_app());
5788 5790
(...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after
6998 // ReconcileKnownDisabled(). 7000 // ReconcileKnownDisabled().
6999 service_->EnableExtension(good2); 7001 service_->EnableExtension(good2);
7000 service_->ReconcileKnownDisabled(); 7002 service_->ReconcileKnownDisabled();
7001 expected_extensions.insert(good2); 7003 expected_extensions.insert(good2);
7002 expected_disabled_extensions.erase(good2); 7004 expected_disabled_extensions.erase(good2);
7003 7005
7004 EXPECT_EQ(expected_extensions, registry_->enabled_extensions().GetIDs()); 7006 EXPECT_EQ(expected_extensions, registry_->enabled_extensions().GetIDs());
7005 EXPECT_EQ(expected_disabled_extensions, 7007 EXPECT_EQ(expected_disabled_extensions,
7006 registry_->disabled_extensions().GetIDs()); 7008 registry_->disabled_extensions().GetIDs());
7007 } 7009 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/extension_sync_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698