Index: chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc |
index 322df28a87ae696adc84afc0935285de20ffdc86..e6d8d6f6665a957ef49b3a6d50b8f1710a339b50 100644 |
--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc |
+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc |
@@ -12,6 +12,7 @@ |
#include "chrome/browser/sync/test/integration/sync_app_list_helper.h" |
#include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
#include "chrome/browser/sync/test/integration/sync_test.h" |
+#include "chrome/browser/ui/app_list/app_list_prefs.h" |
#include "chrome/browser/ui/app_list/app_list_syncable_service.h" |
#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h" |
#include "content/public/browser/notification_service.h" |
@@ -393,6 +394,10 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, Move) { |
ASSERT_TRUE(SetupSync()); |
ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier()); |
+ EXPECT_EQ( |
+ 0u, |
+ app_list::AppListPrefs::Get(GetProfile(1))->GetAllAppListInfos().size()); |
+ |
const int kNumApps = 5; |
for (int i = 0; i < kNumApps; ++i) { |
InstallApp(GetProfile(0), i); |
@@ -402,6 +407,11 @@ IN_PROC_BROWSER_TEST_F(TwoClientAppListSyncTest, Move) { |
ASSERT_TRUE(AwaitQuiescence()); |
ASSERT_TRUE(AllProfilesHaveSameAppListAsVerifier()); |
+ // Ensure downsync triggers an update for local prefs. |
+ EXPECT_EQ( |
+ static_cast<size_t>(kNumApps), |
+ app_list::AppListPrefs::Get(GetProfile(1))->GetAllAppListInfos().size()); |
Matt Giuca
2014/09/30 02:49:46
Can you add some checks on the values returned by
calamity
2014/09/30 05:40:07
Done.
|
+ |
size_t first = kNumDefaultApps; |
SyncAppListHelper::GetInstance()->MoveApp( |
GetProfile(0), first + 1, first + 2); |