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

Unified Diff: chrome/test/live_sync/live_apps_sync_test.cc

Issue 7104072: Adding new extension sync integration tests. Also modified the way that profile (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: More review changes Created 9 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/test/live_sync/live_apps_sync_test.h ('k') | chrome/test/live_sync/live_extensions_sync_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/live_sync/live_apps_sync_test.cc
diff --git a/chrome/test/live_sync/live_apps_sync_test.cc b/chrome/test/live_sync/live_apps_sync_test.cc
index 885949a0f2725e14e2f20df9000fa8851155367c..8fb6da906daae01a7bc938df22df9183b1711f70 100644
--- a/chrome/test/live_sync/live_apps_sync_test.cc
+++ b/chrome/test/live_sync/live_apps_sync_test.cc
@@ -32,16 +32,9 @@ bool LiveAppsSyncTest::SetupClients() {
bool LiveAppsSyncTest::HasSameAppsAsVerifier(int index) {
// TODO(akalin): We may want to filter out non-apps for some tests.
- LiveSyncExtensionHelper::ExtensionStateMap
- verifier_extension_state_map(
- extension_helper_.GetExtensionStates(verifier()));
- LiveSyncExtensionHelper::ExtensionStateMap
- extension_state_map(
- extension_helper_.GetExtensionStates(GetProfile(index)));
- return (extension_state_map == verifier_extension_state_map);
+ return extension_helper_.ExtensionStatesMatch(GetProfile(index), verifier());
}
-
bool LiveAppsSyncTest::AllProfilesHaveSameAppsAsVerifier() {
for (int i = 0; i < num_clients(); ++i) {
if (!HasSameAppsAsVerifier(i)) {
@@ -64,6 +57,26 @@ void LiveAppsSyncTest::UninstallApp(Profile* profile, int index) {
CreateFakeAppName(index));
}
+void LiveAppsSyncTest::EnableApp(Profile* profile, int index) {
+ return extension_helper_.EnableExtension(profile,
+ CreateFakeAppName(index));
+}
+
+void LiveAppsSyncTest::DisableApp(Profile* profile, int index) {
+ return extension_helper_.DisableExtension(profile,
+ CreateFakeAppName(index));
+}
+
+void LiveAppsSyncTest::IncognitoEnableApp(Profile* profile, int index) {
+ return extension_helper_.IncognitoEnableExtension(profile,
+ CreateFakeAppName(index));
+}
+
+void LiveAppsSyncTest::IncognitoDisableApp(Profile* profile, int index) {
+ return extension_helper_.IncognitoDisableExtension(profile,
+ CreateFakeAppName(index));
+}
+
void LiveAppsSyncTest::InstallAppsPendingForSync(
Profile* profile) {
extension_helper_.InstallExtensionsPendingForSync(
« no previous file with comments | « chrome/test/live_sync/live_apps_sync_test.h ('k') | chrome/test/live_sync/live_extensions_sync_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698