Extract kArcEnabled preference from ArcSessionManager part 2.

chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc

Index: chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
diff --git a/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d5c35834806dc6b5a91772e166aaa991dacd46d6
--- /dev/null
+++ b/chrome/browser/chromeos/arc/arc_play_store_enabled_preference_handler.cc
@@ -0,0 +1,141 @@
+// Copyright 2017 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/chromeos/arc/arc_play_store_enabled_preference_handler.h"
+
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/wm_shell.h"
+#include "base/bind.h"
+#include "base/command_line.h"
+#include "base/logging.h"
+#include "chrome/browser/chromeos/arc/arc_auth_notification.h"
+#include "chrome/browser/chromeos/arc/arc_optin_uma.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
+#include "chrome/browser/chromeos/arc/arc_support_host.h"
+#include "chrome/browser/chromeos/arc/arc_util.h"
+#include "chrome/browser/prefs/pref_service_syncable_util.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/pref_names.h"
+#include "chromeos/chromeos_switches.h"
+#include "components/sync_preferences/pref_service_syncable.h"
+#include "content/public/browser/browser_thread.h"
+
+namespace arc {
+
+ArcPlayStoreEnabledPreferenceHandler::ArcPlayStoreEnabledPreferenceHandler(
+    Profile* profile,
+    ArcSessionManager* arc_session_manager)
+    : profile_(profile),
+      arc_session_manager_(arc_session_manager),
+      weak_ptr_factory_(this) {
+  DCHECK(profile_);
+  DCHECK(arc_session_manager_);
+}
+
+ArcPlayStoreEnabledPreferenceHandler::~ArcPlayStoreEnabledPreferenceHandler() {
+  ArcAuthNotification::Hide();
+  sync_preferences::PrefServiceSyncable* pref_service_syncable =
+      PrefServiceSyncableFromProfile(profile_);
+  pref_service_syncable->RemoveObserver(this);
+  pref_change_registrar_.RemoveAll();
+}
+
+void ArcPlayStoreEnabledPreferenceHandler::Start() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  // Start observing Google Play Store enabled preference.
+  pref_change_registrar_.Init(profile_->GetPrefs());
+  pref_change_registrar_.Add(
+      prefs::kArcEnabled,
+      base::Bind(&ArcPlayStoreEnabledPreferenceHandler::OnPreferenceChanged,
+                 weak_ptr_factory_.GetWeakPtr()));
+
+  // Set initial managed state to ArcSupportHost to update the message.
+  auto* support_host = arc_session_manager_->support_host();
+  if (support_host) {
+    support_host->SetArcManaged(
+        IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_));
+  }
+
+  // Update the state based on the initial Google Play Store enabled value.
+  if (IsArcPlayStoreEnabledForProfile(profile_)) {
+    VLOG(1) << "Google Play Store is already enabled.";
+    arc_session_manager_->RequestEnable();
+  } else {
+    if (IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_)) {
+      // All users that can disable Google Play Store by themselves will have
+      // the |kARcDataRemoveRequested| pref set, so we don't need to eagerly
+      // remove the data for that case.
+      // For managed users, the preference can change when the Profile object is
+      // not alive, so we still need to check it here in case it was disabled to
+      // ensure that the data is deleted in case it was disabled between
+      // launches.
+      VLOG(1) << "Google Play Store is initially disabled for managed "
+              << "profile. Removing data.";
+      arc_session_manager_->RemoveArcData();
+    }
+    PrefServiceSyncableFromProfile(profile_)->AddObserver(this);
+    OnIsSyncingChanged();
+  }
+}
+
+void ArcPlayStoreEnabledPreferenceHandler::OnPreferenceChanged() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  const bool is_play_store_enabled = IsArcPlayStoreEnabledForProfile(profile_);

[Luis Héctor Chávez, 2017/03/02 00:09:17]

Is it possible to merge the implementations of Start() and this into a single
method? Probably take in a parameter to indicate whether it's the first start or
not to skip the skipping (ha!) of removing ARC data. That'll be less error-prone
in the future.

[hidehiko, 2017/03/02 02:21:57]

Could you elaborate your intention a bit more?
IIUC, what we can share between them is just ArcSupportHost::SetArcManaged  and
ArcSessionManager::RequestEnable/Disable only, which looks small to me?

[Luis Héctor Chávez, 2017/03/02 03:21:09]

That's correct, but that's also the bulk of
ArcPlayStoreEnabledPreferenceHandler::Start() (sans actually observing the
pref). The main goal would be to minimize the number of places where
RequestEnable()/RequestDisable() are called from. And after thinking it more,
it'd be better to not pass the parameter whether it's the first boot or not:
just keep the started-at-profile-init/started-later case-specific code in their
own functions.

Having said that, I don't feel _too_ strongly about this because as you
mentioned, the LOC savings are low.

[hidehiko, 2017/03/02 16:37:08]

Thank you for explanation. I believe I understand your intention. So done.

+  const bool is_play_store_managed =
+      IsArcPlayStoreEnabledPreferenceManagedForProfile(profile_);
+  if (!is_play_store_managed) {
+    // Update UMA only for non-Managed cases.
+    UpdateOptInActionUMA(is_play_store_enabled ? OptInActionType::OPTED_IN
+                                               : OptInActionType::OPTED_OUT);
+
+    if (!is_play_store_enabled) {
+      // Remove the pinned Play Store icon launcher in Shelf.
+      // This is only for non-Managed cases. In managed cases, it is expected
+      // to be "disabled" rather than "removed", so keep it here.
+      auto* shelf_delegate = ash::WmShell::HasInstance()
+                                 ? ash::WmShell::Get()->shelf_delegate()
+                                 : nullptr;
+      if (shelf_delegate)
+        shelf_delegate->UnpinAppWithID(ArcSupportHost::kHostAppId);
+    }
+  }
+
+  auto* support_host = arc_session_manager_->support_host();
+  if (support_host)
+    support_host->SetArcManaged(is_play_store_managed);
+
+  // Hide auth notification if it was opened before and arc.enabled pref was
+  // explicitly set to true or false.
+  if (profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled))
+    ArcAuthNotification::Hide();
+
+  if (is_play_store_enabled)
+    arc_session_manager_->RequestEnable();
+  else
+    arc_session_manager_->RequestDisable();
+
+  // Due to life time management, OnArcPlayStoreEnabledChanged() is notified
+  // via ArcSessionManager, so that external services can subscribe at almost
+  // any time.
+  arc_session_manager_->NotifyArcPlayStoreEnabledChanged(is_play_store_enabled);
+}
+
+void ArcPlayStoreEnabledPreferenceHandler::OnIsSyncingChanged() {
+  sync_preferences::PrefServiceSyncable* const pref_service_syncable =
+      PrefServiceSyncableFromProfile(profile_);
+  if (!pref_service_syncable->IsSyncing())
+    return;
+  pref_service_syncable->RemoveObserver(this);
+
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(

[Yusuke Sato, 2017/03/01 18:09:26]

qq: should we move this to c/a/arc_util.cc? (I'm not really sure as I'm not
familiar with the flag.)

[hidehiko, 2017/03/01 19:21:31]

I think it's nice to have. Let's do it in another CL, because
kEnableArcOOBEOptIn is used in several places.

[Yusuke Sato, 2017/03/01 19:50:19]

sgtm, please add a TODO unless you already have a CL.

[hidehiko, 2017/03/02 02:21:57]

Done.

+          chromeos::switches::kEnableArcOOBEOptIn) &&
+      profile_->IsNewProfile() &&
+      !profile_->GetPrefs()->HasPrefPath(prefs::kArcEnabled)) {
+    ArcAuthNotification::Show(profile_);
+  }
+}
+
+}  // namespace arc