[Merge To M54]arc: Fix race when arc package sync service starts.

chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h

Index: chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h
diff --git a/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h b/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h
index 78a9d01e1d2bc6af8fd82602019badd84a55adea..917f711bfeb2b9cd2d5ad021d41ac06e5a7dabd3 100644
--- a/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h
+++ b/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.h
@@ -6,8 +6,7 @@
 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_PACKAGE_SYNC_DATA_TYPE_CONTROLLER_H_
 
 #include "base/macros.h"
-#include "components/arc/common/app.mojom.h"
-#include "components/arc/instance_holder.h"
+#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/sync/driver/data_type_controller.h"
 #include "components/sync/driver/ui_data_type_controller.h"
@@ -22,7 +21,7 @@ class Profile;
 // disables these types based on whether ArcAppInstance is ready.
 class ArcPackageSyncDataTypeController
     : public sync_driver::UIDataTypeController,
-      public arc::InstanceHolder<arc::mojom::AppInstance>::Observer {
+      public ArcAppListPrefs::Observer {
  public:
   ArcPackageSyncDataTypeController(syncer::ModelType type,
                                    const base::Closure& error_callback,
@@ -32,13 +31,13 @@ class ArcPackageSyncDataTypeController
   // UIDataTypeController override:
   bool ReadyForStart() const override;
   bool StartModels() override;
+  void StopModels() override;
 
  private:
   // DataTypeController is RefCounted.
   ~ArcPackageSyncDataTypeController() override;
 
-  // arc::InstanceHolder<arc::mojom::AppInstance>::Observer:
-  void OnInstanceReady() override;
+  void OnPackageListInitialRefreshed() override;
 
   void OnArcEnabledPrefChanged();