Enable Arc Pacakge sync datatype at proper time.

We enable Arc package sync datatype when user enables Arc, and call
StartModels when Arc app instance is ready and Arc packages get
refreshed. But There is a big time gap since we need perform provision
for Arc during opt-in. And this may lead to the high config time-out
rate for Arc packages.

Enable the datatype when provision is successful and reduce the gap
between enabling the sync data type and calling startModels.

Bug: 771838
Test: Manual test and Arc pacakge related integration test.
Change-Id: I4c70c9d7e3c690fc953dac981398424d166ce51f
Reviewed-on: https://chromium-review.googlesource.com/702014Reviewed-by: Pavel Yatsuk <pavely@chromium.org>
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Long Cheng <lgcheng@google.com>
Cr-Commit-Position: refs/heads/master@{#506817}

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

@@ -8,8 +8,6 @@
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
-#include "components/arc/arc_prefs.h"
-#include "components/prefs/pref_service.h"
 #include "components/sync/base/pref_names.h"
 #include "components/sync/base/sync_prefs.h"
 #include "components/sync/driver/sync_client.h"
@@ -26,14 +24,15 @@ ArcPackageSyncDataTypeController::ArcPackageSyncDataTypeController(
                                            syncer::GROUP_UI,
                                            base::ThreadTaskRunnerHandle::Get()),
       profile_(profile) {
-  pref_registrar_.Init(profile_->GetPrefs());
-  pref_registrar_.Add(
-      arc::prefs::kArcEnabled,
-      base::Bind(&ArcPackageSyncDataTypeController::OnArcEnabledPrefChanged,
-                 base::Unretained(this)));
+  arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
+  if (arc_session_manager)
+    arc_session_manager->AddObserver(this);
 }
 
 ArcPackageSyncDataTypeController::~ArcPackageSyncDataTypeController() {
+  arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
+  if (arc_session_manager)
+    arc_session_manager->RemoveObserver(this);
 }
 
 bool ArcPackageSyncDataTypeController::ReadyForStart() const {
@@ -72,21 +71,25 @@ void ArcPackageSyncDataTypeController::OnPackageListInitialRefreshed() {
   OnModelLoaded();
 }
 
-void ArcPackageSyncDataTypeController::OnArcEnabledPrefChanged() {
+void ArcPackageSyncDataTypeController::OnArcPlayStoreEnabledChanged(
+    bool enabled) {
   DCHECK(CalledOnValidThread());
 
-  if (!ReadyForStart()) {
-    // If enable ARC in settings is turned off then generate an unrecoverable
-    // error.
-    if (state() != NOT_RUNNING && state() != STOPPING) {
-      syncer::SyncError error(
-          FROM_HERE, syncer::SyncError::DATATYPE_POLICY_ERROR,
-          "ARC package sync is now disabled because user disables ARC.",
-          type());
-      CreateErrorHandler()->OnUnrecoverableError(error);
-    }
+  // Delay enabling DTC until ARC successfully signed in.
+  if (ReadyForStart())
     return;
+
+  // If enable ARC in settings is turned off then generate an unrecoverable
+  // error.
+  if (state() != NOT_RUNNING && state() != STOPPING) {
+    syncer::SyncError error(
+        FROM_HERE, syncer::SyncError::DATATYPE_POLICY_ERROR,
+        "ARC package sync is now disabled because user disables ARC.", type());
+    CreateErrorHandler()->OnUnrecoverableError(error);
   }
+}
+
+void ArcPackageSyncDataTypeController::OnArcInitialStart() {
   EnableDataType();
 }
 

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

@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_PACKAGE_SYNC_DATA_TYPE_CONTROLLER_H_
 
 #include "base/macros.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
-#include "components/prefs/pref_change_registrar.h"
 #include "components/sync/driver/async_directory_type_controller.h"
 #include "components/sync/driver/data_type_controller.h"
 
@@ -21,7 +21,8 @@ class SyncClient;
 // disables these types based on whether ArcAppInstance is ready.
 class ArcPackageSyncDataTypeController
     : public syncer::AsyncDirectoryTypeController,
-      public ArcAppListPrefs::Observer {
+      public ArcAppListPrefs::Observer,
+      public arc::ArcSessionManager::Observer {
  public:
   // |dump_stack| is called when an unrecoverable error occurs.
   ArcPackageSyncDataTypeController(syncer::ModelType type,
@@ -39,18 +40,19 @@ class ArcPackageSyncDataTypeController
   // ArcAppListPrefs::Observer:
   void OnPackageListInitialRefreshed() override;
 
-  void OnArcEnabledPrefChanged();
+  // ArcSessionManager::Observer:
+  void OnArcPlayStoreEnabledChanged(bool enabled) override;
+  void OnArcInitialStart() override;
 
   void EnableDataType();
 
+  // Returns true if user enables app sync.
   bool ShouldSyncArc() const;
 
   bool model_normal_start_ = true;
 
   Profile* const profile_;
 
-  PrefChangeRegistrar pref_registrar_;
-
   DISALLOW_COPY_AND_ASSIGN(ArcPackageSyncDataTypeController);
 };
 #endif  // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_PACKAGE_SYNC_DATA_TYPE_CONTROLLER_H_