Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(455)

Unified Diff: chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc

Issue 2174753004: arc:Integration test for Arc package Chrome sync. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@current
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c8b671fdc887afee2ea6597db6a535f3ac7be3e7..41a1373fc459500a71800c129b68cc2f16c3ff23 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
@@ -138,8 +138,8 @@ syncer::SyncMergeResult ArcPackageSyncableService::MergeDataAndStartSyncing(
CreateSyncItemFromSyncData(sync_data));
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);
lgcheng 2016/07/22 20:28:03 I change the order because InstallPackage is synch
+ 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);
@@ -357,16 +357,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;
}
@@ -388,8 +388,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;
}

Powered by Google App Engine
This is Rietveld 408576698