arc: Fix Android App resurrected by sync.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_PACKAGE_SYNC_DATA_TYPE_CONTROLLER_H_
 #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 "components/prefs/pref_change_registrar.h"
 #include "components/sync/driver/data_type_controller.h"
 #include "components/sync/driver/ui_data_type_controller.h"
 
 namespace sync_driver {
 class SyncClient;
 }
 
 class Profile;
 
 // A UIDataTypeController for arc package sync datatypes, which enables or
 // disables these types based on whether ArcAppInstance is ready.
 class ArcPackageSyncDataTypeController
-    : public sync_driver::UIDataTypeController {
+    : public sync_driver::UIDataTypeController,
+      public arc::InstanceHolder<arc::mojom::AppInstance>::Observer {
  public:
   // |dump_stack| is called when an unrecoverable error occurs.
   ArcPackageSyncDataTypeController(syncer::ModelType type,
                                    const base::Closure& dump_stack,
                                    sync_driver::SyncClient* sync_client,
                                    Profile* profile);
   ~ArcPackageSyncDataTypeController() override;
 
+  // UIDataTypeController override:
   bool ReadyForStart() const override;
+  bool StartModels() override;
 
  private:
-  void OnArcAppsSyncPrefChanged();
+  // arc::InstanceHolder<arc::mojom::AppInstance>::Observer:
+  void OnInstanceReady() override;
 
   void OnArcEnabledPrefChanged();
 
+  void EnableDataType();
+
+  bool ShouldSyncArc() const;
+
+  bool model_normal_start_ = true;
+
   Profile* const profile_;
 
   sync_driver::SyncClient* sync_client_;
 
   PrefChangeRegistrar pref_registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcPackageSyncDataTypeController);
 };
 #endif  // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_PACKAGE_SYNC_DATA_TYPE_CONTROLLER_H_