Protect AppListItemList Add/Remove and fix sync bugs

chrome/browser/ui/app_list/extension_app_model_builder.cc

 // Copyright (c) 2012 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/ui/app_list/extension_app_model_builder.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/prefs/pref_service.h"
@@ skipping 41 matching lines @@
       tracker_(NULL) {
 }
 
 ExtensionAppModelBuilder::~ExtensionAppModelBuilder() {
   OnShutdown();
   model_->item_list()->RemoveObserver(this);
 }
 
 void ExtensionAppModelBuilder::InitializeWithService(
     app_list::AppListSyncableService* service) {
+  DCHECK(!service_ && !profile_);
   model_ = service->model();
   model_->item_list()->AddObserver(this);
   service_ = service;
   profile_ = service->profile();
   BuildModel();
 }
 
 void ExtensionAppModelBuilder::InitializeWithProfile(
     Profile* profile,
     app_list::AppListModel* model) {
+  DCHECK(!service_ && !profile_);
   model_ = model;
   model_->item_list()->AddObserver(this);
   profile_ = profile;
   BuildModel();
 }
 
 void ExtensionAppModelBuilder::OnBeginExtensionInstall(
     const ExtensionInstallParams& params) {
   if (!params.is_app || params.is_ephemeral)
     return;
@@ skipping 16 matching lines @@
     const std::string& extension_id,
     int percent_downloaded) {
   ExtensionAppItem* item = GetExtensionAppItem(extension_id);
   if (!item)
     return;
   item->SetPercentDownloaded(percent_downloaded);
 }
 
 void ExtensionAppModelBuilder::OnInstallFailure(
     const std::string& extension_id) {
-  model_->item_list()->DeleteItem(extension_id);
+  model_->DeleteItem(extension_id);
 }
 
 void ExtensionAppModelBuilder::OnExtensionLoaded(const Extension* extension) {
   if (!extension->ShouldDisplayInAppLauncher())
     return;
 
   DVLOG(2) << service_ << ": OnExtensionLoaded: "
            << extension->id().substr(0, 8);
   ExtensionAppItem* existing_item = GetExtensionAppItem(extension->id());
   if (existing_item) {
@@ skipping 16 matching lines @@
 }
 
 void ExtensionAppModelBuilder::OnExtensionUninstalled(
     const Extension* extension) {
   if (service_) {
     DVLOG(2) << service_ << ": OnExtensionUninstalled: "
              << extension->id().substr(0, 8);
     service_->RemoveItem(extension->id());
     return;
   }
-  model_->item_list()->DeleteItem(extension->id());
+  model_->DeleteItem(extension->id());
 }
 
 void ExtensionAppModelBuilder::OnAppsReordered() {
   // Do nothing; App List order does not track extensions order.
 }
 
 void ExtensionAppModelBuilder::OnAppInstalledToAppList(
     const std::string& extension_id) {
   SetHighlightedApp(extension_id);
 }
@@ skipping 28 matching lines @@
     if (ShouldDisplayInAppLauncher(profile_, *app)) {
       apps->push_back(CreateAppItem((*app)->id(),
                                     "",
                                     gfx::ImageSkia(),
                                     (*app)->is_platform_app()));
     }
   }
 }
 
 void ExtensionAppModelBuilder::BuildModel() {
-  // Delete any extension apps.
-  model_->item_list()->DeleteItemsByType(ExtensionAppItem::kItemType);
-
-  if (tracker_)
-    tracker_->RemoveObserver(this);
-
+  DCHECK(!tracker_);
   tracker_ = controller_->GetInstallTrackerFor(profile_);
 
   PopulateApps();
   UpdateHighlight();
 
   // Start observing after model is built.
   if (tracker_)
     tracker_->AddObserver(this);
 }
 
 void ExtensionAppModelBuilder::PopulateApps() {
   extensions::ExtensionSet extensions;
   controller_->GetApps(profile_, &extensions);
   ExtensionAppList apps;
   AddApps(&extensions, &apps);
 
   if (apps.empty())
     return;
 
   for (size_t i = 0; i < apps.size(); ++i)
     InsertApp(apps[i]);
 }
 
 void ExtensionAppModelBuilder::InsertApp(ExtensionAppItem* app) {
   if (service_) {
     service_->AddItem(app);
     return;
   }
-  model_->item_list()->AddItem(app);
+  model_->AddItem(app);
 }
 
 void ExtensionAppModelBuilder::SetHighlightedApp(
     const std::string& extension_id) {
   if (extension_id == highlight_app_id_)
     return;
   ExtensionAppItem* old_app = GetExtensionAppItem(highlight_app_id_);
   if (old_app)
     old_app->SetHighlighted(false);
   highlight_app_id_ = extension_id;
@@ skipping 50 matching lines @@
     app_list::AppListItem* item = item_list->item_at(idx + 1);
     if (item->GetItemType() == ExtensionAppItem::kItemType) {
       next = static_cast<ExtensionAppItem*>(item);
       break;
     }
   }
   // item->Move will call set_position, overriding the item's position.
   if (prev || next)
     static_cast<ExtensionAppItem*>(item)->Move(prev, next);
 }