Run RemoveArcData after a user has opted out

components/arc/arc_service_manager.cc

 // Copyright 2015 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 "components/arc/arc_service_manager.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/arc/arc_bridge_bootstrap.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_bridge_service_impl.h"
 #include "components/arc/audio/arc_audio_bridge.h"
 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
 #include "components/arc/clipboard/arc_clipboard_bridge.h"
 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
 #include "components/arc/ime/arc_ime_service.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/arc/metrics/arc_metrics_service.h"
 #include "components/arc/net/arc_net_host_impl.h"
 #include "components/arc/obb_mounter/arc_obb_mounter_bridge.h"
 #include "components/arc/power/arc_power_bridge.h"
 #include "components/arc/storage_manager/arc_storage_manager.h"
+#include "components/arc/user_data/arc_user_data_service.h"
 #include "components/arc/window_manager/arc_window_manager_bridge.h"
+#include "components/prefs/pref_member.h"
 #include "ui/arc/notification/arc_notification_manager.h"
 
 namespace arc {
 
 namespace {
 
 // Weak pointer.  This class is owned by ChromeBrowserMainPartsChromeos.
 ArcServiceManager* g_arc_service_manager = nullptr;
 
 // This pointer is owned by ArcServiceManager.
@@ skipping 22 matching lines @@
       base::WrapUnique(new ArcCrashCollectorBridge(arc_bridge_service())));
   AddService(base::WrapUnique(new ArcImeService(arc_bridge_service())));
   icon_loader_ = new ActivityIconLoader;
   AddService(base::WrapUnique(
       new ArcIntentHelperBridge(arc_bridge_service(), icon_loader_)));
   AddService(base::WrapUnique(new ArcMetricsService(arc_bridge_service())));
   AddService(base::WrapUnique(new ArcNetHostImpl(arc_bridge_service())));
   AddService(base::WrapUnique(new ArcObbMounterBridge(arc_bridge_service())));
   AddService(base::WrapUnique(new ArcPowerBridge(arc_bridge_service())));
   AddService(base::WrapUnique(new ArcStorageManager(arc_bridge_service())));
+
+  arc_user_data_service_ = new ArcUserDataService(this, arc_bridge_service());

[hidehiko, 2016/06/14 02:05:15]

Can we move the instance creation into OnPrimaryUserProfilePrepared(), similar
to ArcNotificationManager?

[dspaid, 2016/06/14 04:34:59]

Done.

+  AddService(base::WrapUnique(arc_user_data_service_));
 }
 
 ArcServiceManager::~ArcServiceManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(g_arc_service_manager == this);
   g_arc_service_manager = nullptr;
   if (g_arc_bridge_service_for_testing) {
     delete g_arc_bridge_service_for_testing;
   }
 }
@@ skipping 10 matching lines @@
   return arc_bridge_service_.get();
 }
 
 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   services_.emplace_back(std::move(service));
 }
 
 void ArcServiceManager::OnPrimaryUserProfilePrepared(
-    const AccountId& account_id) {
+    const AccountId& account_id,
+    std::unique_ptr<BooleanPrefMember> arc_enabled_pref) {
   DCHECK(thread_checker_.CalledOnValidThread());
-
+  arc_enabled_pref_ = std::move(arc_enabled_pref);

[hidehiko, 2016/06/14 02:05:15]

Could you pass the instance to the ArcUserDataService's ctor, and let it keep
the instance's ownership?
Then, you don't need IsArcEnabled in this class, instead ArcUserDataService can
check the value directly. And, you can split the cycle deps, too.

[dspaid, 2016/06/14 04:34:59]

Done.

+  arc_user_data_service_->OnPrimaryUserProfilePrepared(account_id);
   AddService(base::WrapUnique(
       new ArcNotificationManager(arc_bridge_service(), account_id)));
 }
 
+bool ArcServiceManager::IsArcEnabled() const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return arc_enabled_pref_ && arc_enabled_pref_->GetValue();
+}
+
 void ArcServiceManager::OnAshStarted() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // We might come here multiple times. As such we should only do this once.
   if (on_ash_started_called_)
     return;
 
   on_ash_started_called_ = true;
   AddService(
       base::WrapUnique(new ArcWindowManagerBridge(arc_bridge_service())));
 }
 
 void ArcServiceManager::Shutdown() {
   icon_loader_ = nullptr;
   services_.clear();
+  arc_enabled_pref_.reset();
 }
 
 //static
 void ArcServiceManager::SetArcBridgeServiceForTesting(
     std::unique_ptr<ArcBridgeService> arc_bridge_service) {
   if (g_arc_bridge_service_for_testing) {
     delete g_arc_bridge_service_for_testing;
   }
   g_arc_bridge_service_for_testing = arc_bridge_service.release();
 }
 
 }  // namespace arc