Protect AppListItemList Add/Remove and fix sync bugs

chrome/browser/sync/test/integration/sync_app_list_helper.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/test/integration/sync_app_list_helper.h"
 
+#include "base/strings/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.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 "chrome/common/extensions/sync_helper.h"
+#include "ui/app_list/app_list_folder_item.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
 
+using app_list::AppListFolderItem;
+using app_list::AppListItem;
 using app_list::AppListItemList;
-using app_list::AppListItem;
 using app_list::AppListSyncableService;
 using app_list::AppListSyncableServiceFactory;
 
 SyncAppListHelper* SyncAppListHelper::GetInstance() {
   SyncAppListHelper* instance = Singleton<SyncAppListHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
 
 SyncAppListHelper::SyncAppListHelper() : test_(NULL), setup_completed_(false) {
@@ skipping 61 matching lines @@
 bool SyncAppListHelper::AllProfilesHaveSameAppListAsVerifier() {
   bool res = true;
   for (int i = 0; i < test_->num_clients(); ++i) {
     if (!AppListMatchesVerifier(test_->GetProfile(i))) {
       LOG(ERROR) << "Profile " << i
                  << " doesn't have the same app list as the verifier profile.";
       res = false;
     }
   }
   if (!res) {
-    VLOG(1) << "Verifier:";
+    Profile* verifier = test_->verifier();
+    VLOG(1) << "Verifier: "
+            << AppListSyncableServiceFactory::GetForProfile(verifier);
     PrintAppList(test_->verifier());
     for (int i = 0; i < test_->num_clients(); ++i) {
-      VLOG(1) << "Profile: " << i;
-      PrintAppList(test_->GetProfile(i));
+      Profile* profile = test_->GetProfile(i);
+      VLOG(1) << "Profile: " << i << ": "
+              << AppListSyncableServiceFactory::GetForProfile(profile);
+      PrintAppList(profile);
     }
   }
   return res;
 }
 
 void SyncAppListHelper::MoveApp(Profile* profile, size_t from, size_t to) {
   AppListSyncableService* service =
       AppListSyncableServiceFactory::GetForProfile(profile);
   service->model()->item_list()->MoveItem(from, to);
 }
 
 void SyncAppListHelper::CopyOrdinalsToVerifier(Profile* profile,
                                                const std::string& id) {
   AppListSyncableService* service =
       AppListSyncableServiceFactory::GetForProfile(profile);
   AppListSyncableService* verifier =
       AppListSyncableServiceFactory::GetForProfile(test_->verifier());
   verifier->model()->item_list()->SetItemPosition(
       verifier->model()->item_list()->FindItem(id),
       service->model()->item_list()->FindItem(id)->position());
 }
 
 void SyncAppListHelper::PrintAppList(Profile* profile) {
   AppListSyncableService* service =
       AppListSyncableServiceFactory::GetForProfile(profile);
   for (size_t i = 0; i < service->model()->item_list()->item_count(); ++i) {
     AppListItem* item = service->model()->item_list()->item_at(i);
-    extensions::AppSorting* s =
-        extensions::ExtensionSystem::Get(profile)->extension_service()->
-        extension_prefs()->app_sorting();
-    std::string id = item->id();
-    VLOG(1)
-        << "Item(" << i << "): " << item->ToDebugString()
-        << " Page: " << s->GetPageOrdinal(id).ToDebugString().substr(0, 8)
-        << " Item: " << s->GetAppLaunchOrdinal(id).ToDebugString().substr(0, 8);
+    std::string label =
+        base::StringPrintf("Item(%d): ", static_cast<int>(i));
+    PrintItem(profile, item, label);
   }
 }
+
+void SyncAppListHelper::PrintItem(Profile* profile,
+                                  AppListItem* item,
+                                  const std::string& label) {
+  extensions::AppSorting* s =
+      extensions::ExtensionSystem::Get(profile)->extension_service()->
+      extension_prefs()->app_sorting();
+  std::string id = item->id();
+  if (item->GetItemType() == AppListFolderItem::kItemType) {
+    VLOG(1) << label << item->ToDebugString();
+    AppListFolderItem* folder = static_cast<AppListFolderItem*>(item);
+    for (size_t i = 0; i < folder->item_list()->item_count(); ++i) {
+      AppListItem* child = folder->item_list()->item_at(i);
+      std::string child_label =
+          base::StringPrintf(" Folder Item(%d): ", static_cast<int>(i));
+      PrintItem(profile, child, child_label);
+    }
+    return;
+  }
+  VLOG(1)
+      << label << item->ToDebugString()
+      << " Page: " << s->GetPageOrdinal(id).ToDebugString().substr(0, 8)
+      << " Item: " << s->GetAppLaunchOrdinal(id).ToDebugString().substr(0, 8);
+}