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

chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

 // Copyright 2016 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 "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service.h"
+#include "chrome/browser/ui/app_list/app_list_syncable_service_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "mojo/common/common_type_converters.h"
 
 namespace mojo {
@@ skipping 273 matching lines @@
   }
 }
 
 INSTANTIATE_TEST_CASE_P(ArcAppDeferredLauncherBrowserTestInstance,
                         ArcAppDeferredLauncherBrowserTest,
                         ::testing::ValuesIn(build_test_parameter));
 
 // This tests validates pin state on package update and remove.
 IN_PROC_BROWSER_TEST_F(ArcAppLauncherBrowserTest, PinOnPackageUpdateAndRemove) {
   StartInstance();
+
+  // Make use app list sync service is started. Normally it is started when
+  // sycing is initialized.
+  app_list::AppListSyncableServiceFactory::GetForProfile(profile())->GetModel();
+
   InstallTestApps(true);
   SendPackageAdded(false);
 
   const std::string app_id1 = GetTestApp1Id();
   const std::string app_id2 = GetTestApp2Id();
   shelf_delegate()->PinAppWithID(app_id1);
   shelf_delegate()->PinAppWithID(app_id2);
   const ash::ShelfID shelf_id1_before =
       shelf_delegate()->GetShelfIDForAppID(app_id1);
   EXPECT_TRUE(shelf_id1_before);
@@ skipping 32 matching lines @@
   SendPackageAdded(true);
   EXPECT_TRUE(app_list_service->IsAppListVisible());
 
   app_list_service->DismissAppList();
   EXPECT_FALSE(app_list_service->IsAppListVisible());
 
   // Send package update event. App list is not shown.
   SendPackageAdded(true);
   EXPECT_FALSE(app_list_service->IsAppListVisible());
 }