| Index: chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc
|
| diff --git a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc
|
| index 98c686ebbebbd15d444f5a2011689a7ef4371343..6cdf9d257d14a10b3b41f425cdd8ccf6b26ba490 100644
|
| --- a/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc
|
| +++ b/chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc
|
| @@ -134,8 +134,8 @@ syncer::SyncMergeResult ArcPackageSyncableService::MergeDataAndStartSyncing(
|
| CreateSyncItemFromSyncData(sync_data));
|
| const std::string& package_name = sync_item->package_name;
|
| if (!ContainsKey(local_package_set, package_name)) {
|
| - InstallPackage(sync_item.get());
|
| pending_install_items_[package_name] = std::move(sync_item);
|
| + InstallPackage(pending_install_items_[package_name].get());
|
| } else {
|
| // TODO(lgcheng@) may need to handle update exsiting package here.
|
| sync_items_[package_name] = std::move(sync_item);
|
| @@ -349,16 +349,16 @@ bool ArcPackageSyncableService::ProcessSyncItemSpecifics(
|
|
|
| SyncItemMap::const_iterator pending_iter =
|
| pending_install_items_.find(package_name);
|
| - if (pending_iter != sync_items_.end()) {
|
| + if (pending_iter != pending_install_items_.end()) {
|
| // TODO(lgcheng@) may need to create update pending install package
|
| - // logic here.
|
| + // logic here.
|
| return true;
|
| }
|
|
|
| std::unique_ptr<ArcSyncItem> sync_item(
|
| CreateSyncItemFromSyncSpecifics(specifics));
|
| - InstallPackage(sync_item.get());
|
| pending_install_items_[package_name] = std::move(sync_item);
|
| + InstallPackage(pending_install_items_[package_name].get());
|
| return true;
|
| }
|
|
|
| @@ -380,8 +380,8 @@ bool ArcPackageSyncableService::DeleteSyncItemSpecifics(
|
|
|
| SyncItemMap::iterator iter = sync_items_.find(package_name);
|
| if (iter != sync_items_.end()) {
|
| - UninstallPackage(iter->second.get());
|
| pending_uninstall_items_[package_name] = std::move(iter->second);
|
| + UninstallPackage(pending_uninstall_items_[package_name].get());
|
| sync_items_.erase(iter);
|
| return true;
|
| }
|
|
|