Protect AppListItemList Add/Remove and fix sync bugs

chrome/browser/ui/app_list/app_list_syncable_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
 #define CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 70 matching lines @@
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
       scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE;
   virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
   virtual syncer::SyncDataList GetAllSyncData(
       syncer::ModelType type) const OVERRIDE;
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
       const syncer::SyncChangeList& change_list) OVERRIDE;
 
  private:
-  class ItemListObserver;
+  class ModelObserver;
   typedef std::map<std::string, SyncItem*> SyncItemMap;
 
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Builds the model once ExtensionService is ready.
   void BuildModel();
 
   // Returns true if sync has restarted, otherwise runs |flare_|.
   bool SyncStarted();
 
-  // If |app_item| matches an existing sync item, updates the sync item and
-  // returns it. Otherwise adds |app_item| to |sync_items_| and returns the new
-  // item. If |app_item| is invalid returns NULL.
-  SyncItem* AddOrUpdateSyncItem(AppListItem* app_item);
+  // If |app_item| matches an existing sync item, returns it. Otherwise adds
+  // |app_item| to |sync_items_| and returns the new item. If |app_item| is
+  // invalid returns NULL.
+  SyncItem* FindOrAddSyncItem(AppListItem* app_item);
 
   // Creates a sync item for |app_item| and sends an ADD SyncChange event.
   SyncItem* CreateSyncItemFromAppItem(AppListItem* app_item);
 
   // If a sync item for |app_item| already exists, update |app_item| from the
   // sync item, otherwise create a new sync item from |app_item|.
   void AddOrUpdateFromSyncItem(AppListItem* app_item);
 
   // Either uninstalling a default app or remove the REMOVE_DEFAULT sync item.
   // Returns true if the app is removed. Otherwise deletes the existing sync
@@ skipping 36 matching lines @@
       const std::string& item_id,
       sync_pb::AppListSpecifics::AppListItemType item_type);
 
   // Deletes a SyncItem matching |specifics|.
   void DeleteSyncItemSpecifics(const sync_pb::AppListSpecifics& specifics);
 
   Profile* profile_;
   extensions::ExtensionSystem* extension_system_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<AppListModel> model_;
-  scoped_ptr<ItemListObserver> item_list_observer_;
+  scoped_ptr<ModelObserver> model_observer_;
   scoped_ptr<ExtensionAppModelBuilder> apps_builder_;
   scoped_ptr<syncer::SyncChangeProcessor> sync_processor_;
   scoped_ptr<syncer::SyncErrorFactory> sync_error_handler_;
   SyncItemMap sync_items_;
   syncer::SyncableService::StartSyncFlare flare_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListSyncableService);
 };
 
 }  // namespace app_list
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_APP_LIST_SYNCABLE_SERVICE_H_