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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7692003: Revert 97482 - Apps/Extensions Sync refactoring -- delete most of the old glue, implement new syn... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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_data.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
===================================================================
--- chrome/browser/extensions/extension_service_unittest.cc (revision 97482)
+++ chrome/browser/extensions/extension_service_unittest.cc (working copy)
@@ -40,7 +40,6 @@
#include "chrome/browser/prefs/browser_prefs.h"
#include "chrome/browser/prefs/pref_service_mock_builder.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
-#include "chrome/browser/sync/protocol/extension_specifics.pb.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -3447,35 +3446,44 @@
}
namespace {
- class TestSyncProcessorStub : public SyncChangeProcessor {
- virtual SyncError ProcessSyncChanges(
- const tracked_objects::Location& from_here,
- const SyncChangeList& change_list) OVERRIDE {
- return SyncError();
- }
- };
+
+bool AllExtensions(const Extension& extension) {
+ return true;
}
+bool NoExtensions(const Extension& extension) {
+ return false;
+}
+
+bool ExtensionsOnly(const Extension& extension) {
+ return extension.GetType() == Extension::TYPE_EXTENSION;
+}
+
+bool ThemesOnly(const Extension& extension) {
+ return extension.is_theme();
+}
+
+bool GoodOnly(const Extension& extension) {
+ return extension.id() == good_crx;
+}
+
+} // namespace
+
TEST_F(ExtensionServiceTest, GetSyncData) {
InitializeEmptyExtensionService();
InstallCrx(data_dir_.AppendASCII("good.crx"), true);
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
-
- SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
- ASSERT_EQ(list.size(), 1U);
- ExtensionSyncData data(list[0]);
- EXPECT_EQ(extension->id(), data.id());
- EXPECT_FALSE(data.uninstalled());
- EXPECT_EQ(service_->IsExtensionEnabled(good_crx), data.enabled());
- EXPECT_EQ(service_->IsIncognitoEnabled(good_crx), data.incognito_enabled());
- EXPECT_TRUE(data.version().Equals(*extension->version()));
- EXPECT_EQ(extension->update_url(), data.update_url());
- EXPECT_EQ(extension->name(), data.name());
+ ExtensionSyncData data;
+ EXPECT_TRUE(service_->GetSyncData(*extension, &AllExtensions, &data));
+ EXPECT_EQ(extension->id(), data.id);
+ EXPECT_FALSE(data.uninstalled);
+ EXPECT_EQ(service_->IsExtensionEnabled(good_crx), data.enabled);
+ EXPECT_EQ(service_->IsIncognitoEnabled(good_crx), data.incognito_enabled);
+ EXPECT_TRUE(data.version.Equals(*extension->version()));
+ EXPECT_EQ(extension->update_url(), data.update_url);
+ EXPECT_EQ(extension->name(), data.name);
}
TEST_F(ExtensionServiceTest, GetSyncDataTerminated) {
@@ -3484,21 +3492,8 @@
TerminateExtension(good_crx);
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
-
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
-
- SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
- ASSERT_EQ(list.size(), 1U);
- ExtensionSyncData data(list[0]);
- EXPECT_EQ(extension->id(), data.id());
- EXPECT_FALSE(data.uninstalled());
- EXPECT_EQ(service_->IsExtensionEnabled(good_crx), data.enabled());
- EXPECT_EQ(service_->IsIncognitoEnabled(good_crx), data.incognito_enabled());
- EXPECT_TRUE(data.version().Equals(*extension->version()));
- EXPECT_EQ(extension->update_url(), data.update_url());
- EXPECT_EQ(extension->name(), data.name());
+ ExtensionSyncData data;
+ EXPECT_TRUE(service_->GetSyncData(*extension, &AllExtensions, &data));
}
TEST_F(ExtensionServiceTest, GetSyncDataFilter) {
@@ -3506,13 +3501,8 @@
InstallCrx(data_dir_.AppendASCII("good.crx"), true);
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
-
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
- &processor);
-
- SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
- ASSERT_EQ(list.size(), 0U);
+ ExtensionSyncData data;
+ EXPECT_FALSE(service_->GetSyncData(*extension, &ThemesOnly, &data));
}
TEST_F(ExtensionServiceTest, GetSyncDataUserSettings) {
@@ -3521,43 +3511,35 @@
const Extension* extension = service_->GetInstalledExtension(good_crx);
ASSERT_TRUE(extension);
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
-
{
- SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
- ASSERT_EQ(list.size(), 1U);
- ExtensionSyncData data(list[0]);
- EXPECT_TRUE(data.enabled());
- EXPECT_FALSE(data.incognito_enabled());
+ ExtensionSyncData data;
+ EXPECT_TRUE(service_->GetSyncData(*extension, &AllExtensions, &data));
+ EXPECT_TRUE(data.enabled);
+ EXPECT_FALSE(data.incognito_enabled);
}
service_->DisableExtension(good_crx);
{
- SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
- ASSERT_EQ(list.size(), 1U);
- ExtensionSyncData data(list[0]);
- EXPECT_FALSE(data.enabled());
- EXPECT_FALSE(data.incognito_enabled());
+ ExtensionSyncData data;
+ EXPECT_TRUE(service_->GetSyncData(*extension, &AllExtensions, &data));
+ EXPECT_FALSE(data.enabled);
+ EXPECT_FALSE(data.incognito_enabled);
}
service_->SetIsIncognitoEnabled(good_crx, true);
{
- SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
- ASSERT_EQ(list.size(), 1U);
- ExtensionSyncData data(list[0]);
- EXPECT_FALSE(data.enabled());
- EXPECT_TRUE(data.incognito_enabled());
+ ExtensionSyncData data;
+ EXPECT_TRUE(service_->GetSyncData(*extension, &AllExtensions, &data));
+ EXPECT_FALSE(data.enabled);
+ EXPECT_TRUE(data.incognito_enabled);
}
service_->EnableExtension(good_crx);
{
- SyncDataList list = service_->GetAllSyncData(syncable::EXTENSIONS);
- ASSERT_EQ(list.size(), 1U);
- ExtensionSyncData data(list[0]);
- EXPECT_TRUE(data.enabled());
- EXPECT_TRUE(data.incognito_enabled());
+ ExtensionSyncData data;
+ EXPECT_TRUE(service_->GetSyncData(*extension, &AllExtensions, &data));
+ EXPECT_TRUE(data.enabled);
+ EXPECT_TRUE(data.incognito_enabled);
}
}
@@ -3568,38 +3550,25 @@
InstallCrx(data_dir_.AppendASCII("theme.crx"), true);
InstallCrx(data_dir_.AppendASCII("theme2.crx"), true);
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::APPS, SyncDataList(),
- &processor);
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
-
service_->DisableExtension(page_action);
TerminateExtension(theme2_crx);
- EXPECT_EQ(0u, service_->GetAllSyncData(syncable::APPS).size());
- EXPECT_EQ(2u, service_->GetAllSyncData(syncable::EXTENSIONS).size());
+ EXPECT_EQ(4u, service_->GetSyncDataList(&AllExtensions).size());
+ EXPECT_EQ(0u, service_->GetSyncDataList(&NoExtensions).size());
+ EXPECT_EQ(2u, service_->GetSyncDataList(&ExtensionsOnly).size());
+ EXPECT_EQ(2u, service_->GetSyncDataList(&ThemesOnly).size());
+ EXPECT_EQ(1u, service_->GetSyncDataList(&GoodOnly).size());
}
TEST_F(ExtensionServiceTest, ProcessSyncDataUninstall) {
InitializeEmptyExtensionService();
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
- sync_pb::EntitySpecifics specifics;
- sync_pb::ExtensionSpecifics* ext_specifics =
- specifics.MutableExtension(sync_pb::extension);
- ext_specifics->set_id(good_crx);
- ext_specifics->set_version("1.0");
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_DELETE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
+ ExtensionSyncData extension_sync_data;
+ extension_sync_data.id = good_crx;
+ extension_sync_data.uninstalled = true;
// Should do nothing.
- service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_FALSE(service_->GetExtensionById(good_crx, true));
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
// Install the extension.
FilePath extension_path = data_dir_.AppendASCII("good.crx");
@@ -3607,94 +3576,61 @@
EXPECT_TRUE(service_->GetExtensionById(good_crx, true));
// Should uninstall the extension.
- service_->ProcessSyncChanges(FROM_HERE, list);
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
EXPECT_FALSE(service_->GetExtensionById(good_crx, true));
// Should again do nothing.
- service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_FALSE(service_->GetExtensionById(good_crx, true));
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
}
+
TEST_F(ExtensionServiceTest, ProcessSyncDataSettings) {
InitializeEmptyExtensionService();
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
InstallCrx(data_dir_.AppendASCII("good.crx"), true);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx));
- sync_pb::EntitySpecifics specifics;
- sync_pb::ExtensionSpecifics* ext_specifics =
- specifics.MutableExtension(sync_pb::extension);
- ext_specifics->set_id(good_crx);
- ext_specifics->set_version(
- service_->GetInstalledExtension(good_crx)->version()->GetString());
- ext_specifics->set_enabled(false);
+ ExtensionSyncData extension_sync_data;
+ extension_sync_data.id = good_crx;
+ extension_sync_data.version =
+ *(service_->GetInstalledExtension(good_crx)->version());
- {
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
- service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
- EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx));
- }
+ extension_sync_data.enabled = false;
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
+ EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
+ EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx));
- {
- ext_specifics->set_enabled(true);
- ext_specifics->set_incognito_enabled(true);
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
- service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
- EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx));
- }
+ extension_sync_data.enabled = true;
+ extension_sync_data.incognito_enabled = true;
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
+ EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
+ EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx));
- {
- ext_specifics->set_enabled(false);
- ext_specifics->set_incognito_enabled(true);
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
- service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
- EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx));
- }
+ extension_sync_data.enabled = false;
+ extension_sync_data.incognito_enabled = true;
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
+ EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
+ EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx));
EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(good_crx));
}
TEST_F(ExtensionServiceTest, ProcessSyncDataTerminatedExtension) {
InitializeExtensionServiceWithUpdater();
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
InstallCrx(data_dir_.AppendASCII("good.crx"), true);
TerminateExtension(good_crx);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx));
- sync_pb::EntitySpecifics specifics;
- sync_pb::ExtensionSpecifics* ext_specifics =
- specifics.MutableExtension(sync_pb::extension);
- ext_specifics->set_id(good_crx);
- ext_specifics->set_version(
- service_->GetInstalledExtension(good_crx)->version()->GetString());
- ext_specifics->set_enabled(false);
- ext_specifics->set_incognito_enabled(true);
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
-
- service_->ProcessSyncChanges(FROM_HERE, list);
+ ExtensionSyncData extension_sync_data;
+ extension_sync_data.id = good_crx;
+ extension_sync_data.version =
+ *(service_->GetInstalledExtension(good_crx)->version());
+ extension_sync_data.enabled = false;
+ extension_sync_data.incognito_enabled = true;
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx));
@@ -3703,55 +3639,35 @@
TEST_F(ExtensionServiceTest, ProcessSyncDataVersionCheck) {
InitializeExtensionServiceWithUpdater();
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
InstallCrx(data_dir_.AppendASCII("good.crx"), true);
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx));
- sync_pb::EntitySpecifics specifics;
- sync_pb::ExtensionSpecifics* ext_specifics =
- specifics.MutableExtension(sync_pb::extension);
- ext_specifics->set_id(good_crx);
- ext_specifics->set_enabled(true);
+ ExtensionSyncData extension_sync_data;
+ extension_sync_data.id = good_crx;
+ extension_sync_data.enabled = true;
+ extension_sync_data.version =
+ *(service_->GetInstalledExtension(good_crx)->version());
- {
- ext_specifics->set_version(
- service_->GetInstalledExtension(good_crx)->version()->GetString());
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
+ // Should do nothing if extension version == sync version.
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
+ EXPECT_FALSE(service_->updater()->WillCheckSoon());
- // Should do nothing if extension version == sync version.
- service_->ProcessSyncChanges(FROM_HERE, list);
- EXPECT_FALSE(service_->updater()->WillCheckSoon());
- }
-
// Should do nothing if extension version > sync version (but see
- // the TODO in ProcessExtensionSyncData).
+ // the TODO in ProcessSyncData).
{
- ext_specifics->set_version("0.0.0.0");
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
-
- service_->ProcessSyncChanges(FROM_HERE, list);
+ scoped_ptr<Version> version(Version::GetVersionFromString("0.0.0.0"));
+ extension_sync_data.version = *version;
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
EXPECT_FALSE(service_->updater()->WillCheckSoon());
}
// Should kick off an update if extension version < sync version.
{
- ext_specifics->set_version("9.9.9.9");
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
-
- service_->ProcessSyncChanges(FROM_HERE, list);
+ scoped_ptr<Version> version(Version::GetVersionFromString("9.9.9.9"));
+ extension_sync_data.version = *version;
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
EXPECT_TRUE(service_->updater()->WillCheckSoon());
}
@@ -3760,27 +3676,20 @@
TEST_F(ExtensionServiceTest, ProcessSyncDataNotInstalled) {
InitializeExtensionServiceWithUpdater();
- TestSyncProcessorStub processor;
- service_->MergeDataAndStartSyncing(syncable::EXTENSIONS, SyncDataList(),
- &processor);
- sync_pb::EntitySpecifics specifics;
- sync_pb::ExtensionSpecifics* ext_specifics =
- specifics.MutableExtension(sync_pb::extension);
- ext_specifics->set_id(good_crx);
- ext_specifics->set_enabled(false);
- ext_specifics->set_incognito_enabled(true);
- ext_specifics->set_update_url("http://www.google.com/");
- ext_specifics->set_version("1.2.3.4");
- SyncData sync_data = SyncData::CreateLocalData(good_crx, "Name", specifics);
- SyncChange sync_change(SyncChange::ACTION_UPDATE, sync_data);
- SyncChangeList list(1);
- list[0] = sync_change;
+ ExtensionSyncData extension_sync_data;
+ extension_sync_data.id = good_crx;
+ extension_sync_data.update_url = GURL("http://www.google.com");
+ extension_sync_data.enabled = false;
+ extension_sync_data.incognito_enabled = true;
+ {
+ scoped_ptr<Version> version(Version::GetVersionFromString("1.2.3.4"));
+ extension_sync_data.version = *version;
+ }
-
EXPECT_TRUE(service_->IsExtensionEnabled(good_crx));
EXPECT_FALSE(service_->IsIncognitoEnabled(good_crx));
- service_->ProcessSyncChanges(FROM_HERE, list);
+ service_->ProcessSyncData(extension_sync_data, &AllExtensions);
EXPECT_TRUE(service_->updater()->WillCheckSoon());
EXPECT_FALSE(service_->IsExtensionEnabled(good_crx));
EXPECT_TRUE(service_->IsIncognitoEnabled(good_crx));
@@ -3788,7 +3697,7 @@
PendingExtensionInfo info;
EXPECT_TRUE(
service_->pending_extension_manager()->GetById(good_crx, &info));
- EXPECT_EQ(ext_specifics->update_url(), info.update_url().spec());
+ EXPECT_EQ(extension_sync_data.update_url, info.update_url());
EXPECT_TRUE(info.is_from_sync());
EXPECT_TRUE(info.install_silently());
EXPECT_EQ(Extension::INTERNAL, info.install_source());
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/extension_sync_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698