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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_service_sync_unittest.cc

Issue 2257113002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 4 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
« no previous file with comments | « chrome/browser/extensions/extension_resource_protocols.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service_sync_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc
index 68cb30a9584f5f1dd6187f06feddd4ed09409d7f..551eab90a8b0461a44f190e4cad8cabac226a37e 100644
--- a/chrome/browser/extensions/extension_service_sync_unittest.cc
+++ b/chrome/browser/extensions/extension_service_sync_unittest.cc
@@ -163,8 +163,7 @@ class StatefulChangeProcessor : public syncer::FakeSyncChangeProcessor {
// want to
// give up ownership of a local change processor.
std::unique_ptr<syncer::SyncChangeProcessor> GetWrapped() {
- return base::WrapUnique(
- new syncer::SyncChangeProcessorWrapperForTest(this));
+ return base::MakeUnique<syncer::SyncChangeProcessorWrapperForTest>(this);
}
protected:
@@ -192,8 +191,8 @@ class ExtensionServiceSyncTest
ASSERT_TRUE(type == syncer::EXTENSIONS || type == syncer::APPS);
extension_sync_service()->MergeDataAndStartSyncing(
type, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
}
protected:
@@ -286,8 +285,8 @@ TEST_F(ExtensionServiceSyncTest, DeferredSyncStartupOnInstall) {
// Once sync starts, flare should no longer be invoked.
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
path = data_dir().AppendASCII("page_action.crx");
InstallCRX(path, INSTALL_NEW);
EXPECT_FALSE(flare_was_called);
@@ -321,8 +320,8 @@ TEST_F(ExtensionServiceSyncTest, DisableExtensionFromSync) {
// Sync starts up.
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// Then sync data arrives telling us to disable |good0|.
ExtensionSyncData disable_good_crx(*extension, false,
@@ -386,8 +385,8 @@ TEST_F(ExtensionServiceSyncTest, IgnoreSyncChangesWhenLocalStateIsMoreRecent) {
sync_data.push_back(enable_good2.GetSyncData());
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, sync_data,
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
// Both sync changes should be ignored, since the local state was changed
// before sync started, and so the local state is considered more recent.
@@ -418,7 +417,7 @@ TEST_F(ExtensionServiceSyncTest, DontSelfNotify) {
new syncer::FakeSyncChangeProcessor;
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(), base::WrapUnique(processor),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
processor->changes().clear();
@@ -497,8 +496,8 @@ TEST_F(ExtensionServiceSyncTest, GetSyncData) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
syncer::SyncDataList list =
extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
@@ -526,8 +525,8 @@ TEST_F(ExtensionServiceSyncTest, GetSyncDataDisableReasons) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
{
syncer::SyncDataList list =
@@ -598,8 +597,8 @@ TEST_F(ExtensionServiceSyncTest, GetSyncDataTerminated) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
syncer::SyncDataList list =
extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
@@ -627,8 +626,8 @@ TEST_F(ExtensionServiceSyncTest, GetSyncDataFilter) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::APPS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
syncer::SyncDataList list =
extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
@@ -643,8 +642,8 @@ TEST_F(ExtensionServiceSyncTest, GetSyncExtensionDataUserSettings) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
{
syncer::SyncDataList list =
@@ -712,8 +711,8 @@ TEST_F(ExtensionServiceSyncTest, SyncForUninstalledExternalExtension) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
StartSyncing(syncer::APPS);
UninstallExtension(good_crx, false);
@@ -745,8 +744,8 @@ TEST_F(ExtensionServiceSyncTest, GetSyncAppDataUserSettings) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::APPS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
syncer::StringOrdinal initial_ordinal =
syncer::StringOrdinal::CreateInitialOrdinal();
@@ -849,12 +848,12 @@ TEST_F(ExtensionServiceSyncTest, GetSyncDataList) {
extension_sync_service()->MergeDataAndStartSyncing(
syncer::APPS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
service()->DisableExtension(page_action, Extension::DISABLE_USER_ACTION);
TerminateExtension(theme2_crx);
@@ -868,8 +867,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataUninstall) {
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
@@ -942,8 +941,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataSettings) {
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service()->IsExtensionEnabled(good_crx));
@@ -1039,8 +1038,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataNewExtension) {
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
const base::FilePath path = data_dir().AppendASCII("good.crx");
const ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
@@ -1113,8 +1112,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataTerminatedExtension) {
InitializeExtensionServiceWithUpdater();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
@@ -1143,8 +1142,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataVersionCheck) {
InitializeExtensionServiceWithUpdater();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service()->IsExtensionEnabled(good_crx));
@@ -1225,8 +1224,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataNotInstalled) {
InitializeExtensionServiceWithUpdater();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
@@ -1259,8 +1258,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataEnableDisable) {
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
const ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
@@ -1361,8 +1360,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataDeferredEnable) {
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
base::FilePath base_path = data_dir().AppendASCII("permissions_increase");
base::FilePath pem_path = base_path.AppendASCII("permissions.pem");
@@ -1411,8 +1410,8 @@ TEST_F(ExtensionServiceSyncTest, ProcessSyncDataPermissionApproval) {
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
const base::FilePath base_path =
data_dir().AppendASCII("permissions_increase");
@@ -2322,8 +2321,8 @@ TEST_F(ExtensionServiceSyncTest, SyncUninstallByCustodianSkipsPolicy) {
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::WrapUnique(new syncer::FakeSyncChangeProcessor()),
- base::WrapUnique(new syncer::SyncErrorFactoryMock()));
+ base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
+ base::MakeUnique<syncer::SyncErrorFactoryMock>());
extensions::util::SetWasInstalledByCustodian(good2048, profile(), true);
// Install two extensions.
« no previous file with comments | « chrome/browser/extensions/extension_resource_protocols.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698