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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9749012: [Sync] Have SyncableService's take ownership of their SyncChangeProcessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment Created 8 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/extension_service.h ('K') | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/settings/settings_apitest.cc » ('j') | chrome/browser/extensions/settings/settings_apitest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 65df9afe0a7f9395292ad0b6fbf3842ec0f16716..98175295928ed6b028f730cdedba0c841848da78 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -4000,9 +4000,8 @@ TEST_F(ExtensionServiceTest, GetSyncData) {
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
- TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
@@ -4025,7 +4024,7 @@ TEST_F(ExtensionServiceTest, GetSyncDataTerminated) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
@@ -4047,7 +4046,7 @@ TEST_F(ExtensionServiceTest, GetSyncDataFilter) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 0U);
@@ -4061,7 +4060,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
{
SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
@@ -4108,7 +4107,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal();
{
@@ -4152,7 +4151,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
service_->OnExtensionMoved(apps[0]->id(), apps[1]->id(), apps[2]->id());
{
@@ -4187,9 +4186,9 @@ TEST_F(ExtensionServiceTest, GetSyncDataList) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
service_->DisableExtension(page_action);
TerminateExtension(theme2_crx);
@@ -4202,7 +4201,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataUninstall) {
InitializeEmptyExtensionService();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
@@ -4277,7 +4276,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
InitializeExtensionProcessManager();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
@@ -4331,7 +4330,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
InitializeExtensionServiceWithUpdater();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
@@ -4362,7 +4361,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
InitializeRequestContext();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
@@ -4419,7 +4418,7 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
InitializeRequestContext();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
+ scoped_ptr<SyncChangeProcessor>(new TestSyncProcessorStub));
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
« chrome/browser/extensions/extension_service.h ('K') | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/settings/settings_apitest.cc » ('j') | chrome/browser/extensions/settings/settings_apitest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698