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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/api/storage/settings_sync_unittest.cc

Issue 151963002: Remove duplicated code from sync related unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed a const qualifier. Created 6 years, 10 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/api/storage/settings_apitest.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/api/storage/settings_sync_unittest.cc
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index 1e54aaf3ddb3f0492199a2f802738b6403ff8b19..afd33baa503a9f2fe35967c1b3820eef649a19b5 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -20,6 +20,7 @@
#include "extensions/browser/extension_system.h"
#include "extensions/common/manifest.h"
#include "sync/api/sync_change_processor.h"
+#include "sync/api/sync_change_processor_wrapper_for_test.h"
#include "sync/api/sync_error_factory.h"
#include "sync/api/sync_error_factory_mock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -157,33 +158,6 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor {
bool fail_all_requests_;
};
-class SyncChangeProcessorDelegate : public syncer::SyncChangeProcessor {
- public:
- explicit SyncChangeProcessorDelegate(syncer::SyncChangeProcessor* recipient)
- : recipient_(recipient) {
- DCHECK(recipient_);
- }
- virtual ~SyncChangeProcessorDelegate() {}
-
- // syncer::SyncChangeProcessor implementation.
- virtual syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
- const syncer::SyncChangeList& change_list) OVERRIDE {
- return recipient_->ProcessSyncChanges(from_here, change_list);
- }
-
- virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const
- OVERRIDE {
- return recipient_->GetAllSyncData(type);
- }
-
- private:
- // The recipient of all sync changes.
- syncer::SyncChangeProcessor* recipient_;
-
- DISALLOW_COPY_AND_ASSIGN(SyncChangeProcessorDelegate);
-};
-
// SettingsStorageFactory which always returns TestingValueStore objects,
// and allows individually created objects to be returned.
class TestingValueStoreFactory : public SettingsStorageFactory {
@@ -220,7 +194,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
file_thread_(BrowserThread::FILE, base::MessageLoop::current()),
storage_factory_(new util::ScopedSettingsStorageFactory()),
sync_processor_(new MockSyncChangeProcessor),
- sync_processor_delegate_(new SyncChangeProcessorDelegate(
+ sync_processor_wrapper_(new syncer::SyncChangeProcessorWrapperForTest(
sync_processor_.get())) {}
virtual void SetUp() OVERRIDE {
@@ -281,7 +255,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
scoped_ptr<SettingsFrontend> frontend_;
scoped_refptr<util::ScopedSettingsStorageFactory> storage_factory_;
scoped_ptr<MockSyncChangeProcessor> sync_processor_;
- scoped_ptr<SyncChangeProcessorDelegate> sync_processor_delegate_;
+ scoped_ptr<syncer::SyncChangeProcessorWrapperForTest> sync_processor_wrapper_;
};
// Get a semblance of coverage for both EXTENSION_SETTINGS and APP_SETTINGS
@@ -300,7 +274,7 @@ TEST_F(ExtensionSettingsSyncTest, NoDataDoesNotInvokeSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
AddExtensionAndGetStorage("s2", type);
@@ -341,8 +315,9 @@ TEST_F(ExtensionSettingsSyncTest, InSyncDataDoesNotInvokeSync) {
"s2", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
- model_type, sync_data,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ model_type,
+ sync_data,
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
// Already in sync, so no changes.
@@ -379,7 +354,7 @@ TEST_F(ExtensionSettingsSyncTest, LocalDataWithNoSyncDataIsPushedToSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
// All settings should have been pushed to sync.
@@ -416,8 +391,9 @@ TEST_F(ExtensionSettingsSyncTest, AnySyncDataOverwritesLocalData) {
sync_data.push_back(settings_sync_util::CreateData(
"s2", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
- model_type, sync_data,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ model_type,
+ sync_data,
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
expected1.Set("foo", value1.DeepCopy());
expected2.Set("bar", value2.DeepCopy());
@@ -458,8 +434,9 @@ TEST_F(ExtensionSettingsSyncTest, ProcessSyncChanges) {
"s2", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
- model_type, sync_data,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ model_type,
+ sync_data,
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
expected2.Set("bar", value2.DeepCopy());
@@ -532,8 +509,9 @@ TEST_F(ExtensionSettingsSyncTest, PushToSync) {
"s4", "bar", value2, model_type));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
- model_type, sync_data,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ model_type,
+ sync_data,
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
// Add something locally.
@@ -683,7 +661,7 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
GetSyncableService(syncer::EXTENSION_SETTINGS)->MergeDataAndStartSyncing(
syncer::EXTENSION_SETTINGS,
sync_data,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
GetSyncableService(syncer::EXTENSION_SETTINGS)->
StopSyncing(syncer::EXTENSION_SETTINGS);
@@ -693,8 +671,8 @@ TEST_F(ExtensionSettingsSyncTest, ExtensionAndAppSettingsSyncSeparately) {
sync_data.push_back(settings_sync_util::CreateData(
"s2", "bar", value2, syncer::APP_SETTINGS));
- scoped_ptr<SyncChangeProcessorDelegate> app_settings_delegate_(
- new SyncChangeProcessorDelegate(sync_processor_.get()));
+ scoped_ptr<syncer::SyncChangeProcessorWrapperForTest> app_settings_delegate_(
+ new syncer::SyncChangeProcessorWrapperForTest(sync_processor_.get()));
GetSyncableService(syncer::APP_SETTINGS)->MergeDataAndStartSyncing(
syncer::APP_SETTINGS,
sync_data,
@@ -732,7 +710,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
sync_data,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(
new syncer::SyncErrorFactoryMock()));
}
@@ -846,12 +824,12 @@ TEST_F(ExtensionSettingsSyncTest, FailingStartSyncingDisablesSync) {
// Restarting sync should make bad start syncing again.
sync_processor_->ClearChanges();
GetSyncableService(model_type)->StopSyncing(model_type);
- sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
- sync_processor_.get()));
+ sync_processor_wrapper_.reset(
+ new syncer::SyncChangeProcessorWrapperForTest(sync_processor_.get()));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
// Local settings will have been pushed to sync, since it's empty (in this
@@ -928,7 +906,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingProcessChangesDisablesSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
sync_data,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(
new syncer::SyncErrorFactoryMock()));
}
@@ -1034,7 +1012,7 @@ TEST_F(ExtensionSettingsSyncTest, FailingGetAllSyncDataDoesntStopSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
EXPECT_EQ(
@@ -1080,7 +1058,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
testing_factory->GetExisting("bad")->set_error_code(ValueStore::OK);
@@ -1127,12 +1105,12 @@ TEST_F(ExtensionSettingsSyncTest, FailureToReadChangesToPushDisablesSync) {
// to be pushed to sync successfully, as should future changes to bad.
sync_processor_->ClearChanges();
GetSyncableService(model_type)->StopSyncing(model_type);
- sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
- sync_processor_.get()));
+ sync_processor_wrapper_.reset(
+ new syncer::SyncChangeProcessorWrapperForTest(sync_processor_.get()));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
EXPECT_EQ(
@@ -1182,7 +1160,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
sync_processor_->set_fail_all_requests(false);
@@ -1221,12 +1199,12 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalStateDisablesSync) {
// Restarting sync makes everything work again.
sync_processor_->ClearChanges();
GetSyncableService(model_type)->StopSyncing(model_type);
- sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
- sync_processor_.get()));
+ sync_processor_wrapper_.reset(
+ new syncer::SyncChangeProcessorWrapperForTest(sync_processor_.get()));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
EXPECT_EQ(
@@ -1269,7 +1247,7 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
// bad will fail to send changes.
@@ -1318,12 +1296,12 @@ TEST_F(ExtensionSettingsSyncTest, FailureToPushLocalChangeDisablesSync) {
// Restarting sync makes everything work again.
sync_processor_->ClearChanges();
GetSyncableService(model_type)->StopSyncing(model_type);
- sync_processor_delegate_.reset(new SyncChangeProcessorDelegate(
- sync_processor_.get()));
+ sync_processor_wrapper_.reset(
+ new syncer::SyncChangeProcessorWrapperForTest(sync_processor_.get()));
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
EXPECT_EQ(
@@ -1365,7 +1343,7 @@ TEST_F(ExtensionSettingsSyncTest,
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
syncer::SyncDataList(),
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
// Large local change rejected and doesn't get sent out.
@@ -1408,7 +1386,7 @@ TEST_F(ExtensionSettingsSyncTest, Dots) {
GetSyncableService(model_type)->MergeDataAndStartSyncing(
model_type,
sync_data_list,
- sync_processor_delegate_.PassAs<syncer::SyncChangeProcessor>(),
+ sync_processor_wrapper_.PassAs<syncer::SyncChangeProcessor>(),
scoped_ptr<syncer::SyncErrorFactory>(
new syncer::SyncErrorFactoryMock()));
}
« no previous file with comments | « chrome/browser/extensions/api/storage/settings_apitest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698