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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 6 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_service.cc ('k') | chrome/browser/extensions/extension_sync_bundle.h » ('j') | no next file with comments »
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 bbf51246e3e6738a997b9db5322992ea7cd2a548..fe52e0d61a80c7906c6b918c15fe970457fdd564 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -4208,11 +4208,11 @@ TEST_F(ExtensionServiceTest, ComponentExtensions) {
}
namespace {
- class TestSyncProcessorStub : public csync::SyncChangeProcessor {
- virtual csync::SyncError ProcessSyncChanges(
+ class TestSyncProcessorStub : public syncer::SyncChangeProcessor {
+ virtual syncer::SyncError ProcessSyncChanges(
const tracked_objects::Location& from_here,
- const csync::SyncChangeList& change_list) OVERRIDE {
- return csync::SyncError();
+ const syncer::SyncChangeList& change_list) OVERRIDE {
+ return syncer::SyncError();
}
};
}
@@ -4224,11 +4224,11 @@ TEST_F(ExtensionServiceTest, GetSyncData) {
ASSERT_TRUE(extension);
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
- csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
extensions::ExtensionSyncData data(list[0]);
EXPECT_EQ(extension->id(), data.id());
@@ -4249,11 +4249,11 @@ TEST_F(ExtensionServiceTest, GetSyncDataTerminated) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
- csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
extensions::ExtensionSyncData data(list[0]);
EXPECT_EQ(extension->id(), data.id());
@@ -4272,11 +4272,11 @@ TEST_F(ExtensionServiceTest, GetSyncDataFilter) {
ASSERT_TRUE(extension);
TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
- csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 0U);
}
@@ -4288,12 +4288,12 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
extensions::ExtensionSyncData data(list[0]);
EXPECT_TRUE(data.enabled());
@@ -4302,7 +4302,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
service_->DisableExtension(good_crx, Extension::DISABLE_USER_ACTION);
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
extensions::ExtensionSyncData data(list[0]);
EXPECT_FALSE(data.enabled());
@@ -4311,7 +4311,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
service_->SetIsIncognitoEnabled(good_crx, true);
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
extensions::ExtensionSyncData data(list[0]);
EXPECT_FALSE(data.enabled());
@@ -4320,7 +4320,7 @@ TEST_F(ExtensionServiceTest, GetSyncExtensionDataUserSettings) {
service_->EnableExtension(good_crx);
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
ASSERT_EQ(list.size(), 1U);
extensions::ExtensionSyncData data(list[0]);
EXPECT_TRUE(data.enabled());
@@ -4337,9 +4337,9 @@ TEST_F(ExtensionServiceTest, SyncForUninstalledExternalExtension) {
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
UninstallExtension(good_crx, false);
EXPECT_TRUE(service_->IsExternalExtensionUninstalled(good_crx));
@@ -4352,10 +4352,10 @@ TEST_F(ExtensionServiceTest, SyncForUninstalledExternalExtension) {
extension_specifics->set_version("1.0");
extension_specifics->set_enabled(true);
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
service_->ProcessSyncChanges(FROM_HERE, list);
@@ -4370,13 +4370,13 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
ASSERT_TRUE(app->is_app());
TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
StringOrdinal initial_ordinal = StringOrdinal::CreateInitialOrdinal();
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
ASSERT_EQ(list.size(), 1U);
extensions::AppSyncData app_sync_data(list[0]);
@@ -4387,7 +4387,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
ExtensionSorting* sorting = service_->extension_prefs()->extension_sorting();
sorting->SetAppLaunchOrdinal(app->id(), initial_ordinal.CreateAfter());
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
ASSERT_EQ(list.size(), 1U);
extensions::AppSyncData app_sync_data(list[0]);
@@ -4397,7 +4397,7 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettings) {
sorting->SetPageOrdinal(app->id(), initial_ordinal.CreateAfter());
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
ASSERT_EQ(list.size(), 1U);
extensions::AppSyncData app_sync_data(list[0]);
@@ -4419,13 +4419,13 @@ TEST_F(ExtensionServiceTest, GetSyncAppDataUserSettingsOnExtensionMoved) {
}
TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
service_->OnExtensionMoved(apps[0]->id(), apps[1]->id(), apps[2]->id());
{
- csync::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
+ syncer::SyncDataList list = service_->GetAllSyncData(syncable::APPS);
ASSERT_EQ(list.size(), 3U);
extensions::AppSyncData data[kAppCount];
@@ -4458,13 +4458,13 @@ TEST_F(ExtensionServiceTest, GetSyncDataList) {
InstallCRX(data_dir_.AppendASCII("theme2.crx"), INSTALL_NEW);
TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::APPS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ service_->MergeDataAndStartSyncing(syncable::APPS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
service_->DisableExtension(page_action, Extension::DISABLE_USER_ACTION);
TerminateExtension(theme2_crx);
@@ -4477,18 +4477,18 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataUninstall) {
InitializeEmptyExtensionService();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
ext_specifics->set_id(good_crx);
ext_specifics->set_version("1.0");
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_DELETE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(syncer::SyncChange::ACTION_DELETE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
// Should do nothing.
@@ -4527,10 +4527,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataWrongType) {
{
extension_specifics->set_enabled(true);
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_DELETE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_DELETE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
// Should do nothing
@@ -4540,10 +4541,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataWrongType) {
{
extension_specifics->set_enabled(false);
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
// Should again do nothing.
@@ -4557,9 +4559,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
InitializeExtensionProcessManager();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
@@ -4573,10 +4575,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
ext_specifics->set_enabled(false);
{
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
service_->ProcessSyncChanges(FROM_HERE, list);
EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
@@ -4586,10 +4589,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
{
ext_specifics->set_enabled(true);
ext_specifics->set_incognito_enabled(true);
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
service_->ProcessSyncChanges(FROM_HERE, list);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
@@ -4599,10 +4603,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
{
ext_specifics->set_enabled(false);
ext_specifics->set_incognito_enabled(true);
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
service_->ProcessSyncChanges(FROM_HERE, list);
EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
@@ -4616,9 +4621,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
InitializeExtensionServiceWithUpdater();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
@@ -4632,10 +4637,10 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
service_->GetInstalledExtension(good_crx)->version()->GetString());
ext_specifics->set_enabled(false);
ext_specifics->set_incognito_enabled(true);
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
service_->ProcessSyncChanges(FROM_HERE, list);
@@ -4650,9 +4655,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
InitializeRequestContext();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
InstallCRX(data_dir_.AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
@@ -4666,10 +4671,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
{
ext_specifics->set_version(
service_->GetInstalledExtension(good_crx)->version()->GetString());
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
// Should do nothing if extension version == sync version.
@@ -4681,10 +4687,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
// the TODO in ProcessExtensionSyncData).
{
ext_specifics->set_version("0.0.0.0");
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
service_->ProcessSyncChanges(FROM_HERE, list);
@@ -4694,10 +4701,11 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
// Should kick off an update if extension version < sync version.
{
ext_specifics->set_version("9.9.9.9");
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(
+ syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
service_->ProcessSyncChanges(FROM_HERE, list);
@@ -4712,9 +4720,9 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
InitializeRequestContext();
TestSyncProcessorStub processor;
service_->MergeDataAndStartSyncing(
- syncable::EXTENSIONS, csync::SyncDataList(),
- scoped_ptr<csync::SyncChangeProcessor>(new TestSyncProcessorStub),
- scoped_ptr<csync::SyncErrorFactory>(new csync::SyncErrorFactoryMock()));
+ syncable::EXTENSIONS, syncer::SyncDataList(),
+ scoped_ptr<syncer::SyncChangeProcessor>(new TestSyncProcessorStub),
+ scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
@@ -4723,10 +4731,10 @@ TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
ext_specifics->set_incognito_enabled(true);
ext_specifics->set_update_url("http://www.google.com/");
ext_specifics->set_version("1.2.3.4");
- csync::SyncData sync_data =
- csync::SyncData::CreateLocalData(good_crx, "Name", specifics);
- csync::SyncChange sync_change(csync::SyncChange::ACTION_UPDATE, sync_data);
- csync::SyncChangeList list(1);
+ syncer::SyncData sync_data =
+ syncer::SyncData::CreateLocalData(good_crx, "Name", specifics);
+ syncer::SyncChange sync_change(syncer::SyncChange::ACTION_UPDATE, sync_data);
+ syncer::SyncChangeList list(1);
list[0] = sync_change;
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/extension_sync_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698