[Merge-M54] arc: Don't sync app list change caused by Arc opt out.

chrome/browser/ui/app_list/app_list_model_builder.cc

 // Copyright 2015 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/app_list_model_builder.h"
 
 #include <utility>
 
 #include "chrome/browser/ui/app_list/app_list_syncable_service.h"
 #include "ui/app_list/app_list_item.h"
@@ skipping 33 matching lines @@
 
 void AppListModelBuilder::InsertApp(
     std::unique_ptr<app_list::AppListItem> app) {
   if (service_) {
     service_->AddItem(std::move(app));
     return;
   }
   model_->AddItem(std::move(app));
 }
 
-void AppListModelBuilder::RemoveApp(const std::string& id) {
-  if (service_) {
+void AppListModelBuilder::RemoveApp(const std::string& id,
+                                    bool unsynced_change) {
+  if (!unsynced_change && service_) {
     service_->RemoveUninstalledItem(id);
     return;
   }
   model_->DeleteUninstalledItem(id);
 }
 
 const app_list::AppListSyncableService::SyncItem*
     AppListModelBuilder::GetSyncItem(const std::string& id) {
   return service_ ? service_->GetSyncItem(id) : nullptr;
 }
 
 app_list::AppListItem* AppListModelBuilder::GetAppItem(const std::string& id) {
   app_list::AppListItem* item = model_->FindItem(id);
   if (item && item->GetItemType() != item_type_) {
     VLOG(2) << "App Item matching id: " << id
             << " has incorrect type: '" << item->GetItemType() << "'";
     return nullptr;
   }
   return item;
 }