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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_service_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: Rename SyncChangeProcessorDelgate to SyncChangeProcessorDelgator. Created 6 years, 11 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_sync_unittest.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | chrome/browser/search_engines/template_url_service_sync_unittest.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 d2684f143bd4365eb7dd376e6c63102e59031e29..e59a81f2e4b9e139c140e0b5bbb651f603ab2162 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -111,6 +111,7 @@
#include "net/cookies/cookie_options.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
+#include "sync/api/fake_sync_change_processor.h"
#include "sync/api/string_ordinal.h"
#include "sync/api/sync_data.h"
#include "sync/api/sync_error_factory.h"
@@ -5441,23 +5442,6 @@ TEST_F(ExtensionServiceTest, ComponentExtensions) {
EXPECT_EQ(extension_id, (*service_->extensions()->begin())->id());
}
-namespace {
-
-class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
- virtual syncer::SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
- const syncer::SyncChangeList& change_list) OVERRIDE {
- return syncer::SyncError();
- }
-
- virtual syncer::SyncDataList GetAllSyncData(
- syncer::ModelType type) const OVERRIDE {
- return syncer::SyncDataList();
- }
-};
-
-} // namespace
-
TEST_F(ExtensionServiceTest, DeferredSyncStartupPreInstalledComponent) {
InitializeEmptyExtensionService();
InitializeExtensionSyncService();
@@ -5535,8 +5519,10 @@ TEST_F(ExtensionServiceTest, DeferredSyncStartupOnInstall) {
// Once sync starts, flare should no longer be invoked.
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
path = data_dir_.AppendASCII("page_action.crx");
InstallCRX(path, INSTALL_NEW);
@@ -5576,8 +5562,10 @@ TEST_F(ExtensionServiceTest, DisableExtensionFromSync) {
syncer::SyncDataList sync_data;
sync_data.push_back(disable_good_crx.GetSyncData());
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, sync_data,
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ sync_data,
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
ASSERT_FALSE(service_->IsExtensionEnabled(good0));
}
@@ -5620,8 +5608,10 @@ TEST_F(ExtensionServiceTest, DontDisableExtensionWithPendingEnableFromSync) {
syncer::SyncDataList sync_data;
sync_data.push_back(disable_good_crx.GetSyncData());
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, sync_data,
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ sync_data,
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
// The extension was enabled locally before the sync data arrived, so it
@@ -5637,8 +5627,10 @@ TEST_F(ExtensionServiceTest, GetSyncData) {
ASSERT_TRUE(extension);
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
syncer::SyncDataList list = extension_sync_service_->GetAllSyncData(
@@ -5664,10 +5656,12 @@ TEST_F(ExtensionServiceTest, GetSyncDataTerminated) {
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
syncer::SyncDataList list = extension_sync_service_->GetAllSyncData(
@@ -5692,10 +5686,12 @@ TEST_F(ExtensionServiceTest, GetSyncDataFilter) {
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
- TestSyncProcessorStub processor;
- extension_sync_service_->MergeDataAndStartSyncing(syncer::APPS,
+ syncer::FakeSyncChangeProcessor processor;
+ extension_sync_service_->MergeDataAndStartSyncing(
+ syncer::APPS,
syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
syncer::SyncDataList list = extension_sync_service_->GetAllSyncData(
@@ -5711,10 +5707,12 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
{
@@ -5765,10 +5763,12 @@ TEST_F(ExtensionServiceTest, SyncForUninstalledExternalExtension) {
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
UninstallExtension(good_crx, false);
@@ -5802,10 +5802,12 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
ASSERT_TRUE(app);
ASSERT_TRUE(app->is_app());
- TestSyncProcessorStub processor;
- extension_sync_service_->MergeDataAndStartSyncing(syncer::APPS,
+ syncer::FakeSyncChangeProcessor processor;
+ extension_sync_service_->MergeDataAndStartSyncing(
+ syncer::APPS,
syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
syncer::StringOrdinal initial_ordinal =
@@ -5857,10 +5859,12 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) {
ASSERT_TRUE(apps[i]->is_app());
}
- TestSyncProcessorStub processor;
- extension_sync_service_->MergeDataAndStartSyncing(syncer::APPS,
+ syncer::FakeSyncChangeProcessor processor;
+ extension_sync_service_->MergeDataAndStartSyncing(
+ syncer::APPS,
syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
service_->OnExtensionMoved(apps[0]->id(), apps[1]->id(), apps[2]->id());
@@ -5898,14 +5902,18 @@ TEST_F(ExtensionServiceTest, GetSyncDataList) {
InstallCRX(data_dir_.AppendASCII("theme.crx"), INSTALL_NEW);
InstallCRX(data_dir_.AppendASCII("theme2.crx"), INSTALL_NEW);
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::APPS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::APPS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
service_->DisableExtension(page_action, Extension::DISABLE_USER_ACTION);
@@ -5919,10 +5927,12 @@ TEST_F(ExtensionServiceTest, GetSyncDataList) {
TEST_F(ExtensionServiceTest, ProcessSyncDataUninstall) {
InitializeEmptyExtensionService();
InitializeExtensionSyncService();
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
sync_pb::EntitySpecifics specifics;
@@ -6007,10 +6017,12 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
InitializeEmptyExtensionService();
InitializeProcessManager();
InitializeExtensionSyncService();
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -6074,10 +6086,12 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
InitializeExtensionServiceWithUpdater();
InitializeExtensionSyncService();
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -6110,10 +6124,12 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
InitializeExtensionServiceWithUpdater();
InitializeExtensionSyncService();
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
@@ -6178,10 +6194,12 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
InitializeExtensionServiceWithUpdater();
InitializeExtensionSyncService();
- TestSyncProcessorStub processor;
+ syncer::FakeSyncChangeProcessor processor;
extension_sync_service_->MergeDataAndStartSyncing(
- syncer::EXTENSIONS, syncer::SyncDataList(),
- scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ syncer::EXTENSIONS,
+ syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(
+ new syncer::FakeSyncChangeProcessor),
scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
sync_pb::EntitySpecifics specifics;
« no previous file with comments | « chrome/browser/extensions/api/storage/settings_sync_unittest.cc ('k') | chrome/browser/history/history_unittest.cc » ('j') | chrome/browser/search_engines/template_url_service_sync_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698