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

Unified Diff: chrome/browser/extensions/settings/settings_apitest.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
Index: chrome/browser/extensions/settings/settings_apitest.cc
diff --git a/chrome/browser/extensions/settings/settings_apitest.cc b/chrome/browser/extensions/settings/settings_apitest.cc
index c5990cc03cfc83501d98df3ab39a07fcf2f5ac0a..25730367a0c18bba430a78b9b19b4c6c827a7063 100644
--- a/chrome/browser/extensions/settings/settings_apitest.cc
+++ b/chrome/browser/extensions/settings/settings_apitest.cc
@@ -42,6 +42,26 @@ class NoopSyncChangeProcessor : public SyncChangeProcessor {
virtual ~NoopSyncChangeProcessor() {};
};
+class SyncChangeProcessorDelegate : public SyncChangeProcessor {
asargent_no_longer_on_chrome 2012/03/22 22:54:11 This looks like duplicate code from the version in
Nicolas Zea 2012/03/22 23:05:29 That will be arriving as part of a follow-up patch
asargent_no_longer_on_chrome 2012/03/22 23:14:24 Ok, glad to hear it.
+ public:
+ explicit SyncChangeProcessorDelegate(SyncChangeProcessor* recipient)
+ : recipient_(recipient) {
+ DCHECK(recipient_);
+ }
+ virtual ~SyncChangeProcessorDelegate() {}
+
+ // SyncChangeProcessor implementation.
+ virtual SyncError ProcessSyncChanges(
+ const tracked_objects::Location& from_here,
+ const SyncChangeList& change_list) OVERRIDE {
+ return recipient_->ProcessSyncChanges(from_here, change_list);
+ }
+
+ private:
+ // The recipient of all sync changes.
+ SyncChangeProcessor* recipient_;
+};
+
} // namespace
class ExtensionSettingsApiTest : public ExtensionApiTest {
@@ -139,7 +159,8 @@ class ExtensionSettingsApiTest : public ExtensionApiTest {
EXPECT_FALSE(settings_service->MergeDataAndStartSyncing(
kModelType,
SyncDataList(),
- sync_processor).IsSet());
+ scoped_ptr<SyncChangeProcessor>(
+ new SyncChangeProcessorDelegate(sync_processor))).IsSet());
}
void SendChangesToSyncableService(

Powered by Google App Engine
This is Rietveld 408576698