Run RemoveArcData after a user has opted out

chrome/browser/chromeos/arc/arc_data_manager.cc

Index: chrome/browser/chromeos/arc/arc_data_manager.cc
diff --git a/chrome/browser/chromeos/arc/arc_data_manager.cc b/chrome/browser/chromeos/arc/arc_data_manager.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c36d60fae92b79a6cab1257b3a3759c9856b2b2f
--- /dev/null
+++ b/chrome/browser/chromeos/arc/arc_data_manager.cc
@@ -0,0 +1,65 @@
+// 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.
+
+#include "chrome/browser/chromeos/arc/arc_data_manager.h"
+
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/pref_names.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
+#include "components/prefs/pref_service.h"
+#include "components/user_manager/user.h"
+
+namespace arc {
+
+namespace {
+
+// Weak Pointer.  This class is owned by ChromeBrowserMainPartsChromeos.
+ArcDataManager* g_arc_data_manager = nullptr;
+
+}  // namespace
+
+ArcDataManager::ArcDataManager() {
+  DCHECK(!g_arc_data_manager);
+  DCHECK(thread_checker_.CalledOnValidThread());

[Daniel Erat, 2016/05/12 16:33:34]

ThreadChecker appears to initially determine the "valid" thread based on where
it's constructed, so i don't think that calling this from ArcDataManager's c'tor
actually does anything.

[dspaid, 2016/05/13 01:19:24]

Done.

+  g_arc_data_manager = this;
+  ArcBridgeService::Get()->AddObserver(this);
+}
+
+ArcDataManager::~ArcDataManager() {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(g_arc_data_manager == this);
+  ArcBridgeService::Get()->RemoveObserver(this);
+  g_arc_data_manager = nullptr;
+}
+
+// static
+ArcDataManager* ArcDataManager::Get() {
+  DCHECK(g_arc_data_manager);
+  DCHECK(g_arc_data_manager->thread_checker_.CalledOnValidThread());
+  return g_arc_data_manager;
+}
+
+void ArcDataManager::OnStateChanged(ArcBridgeService::State state) {

[Daniel Erat, 2016/05/12 16:33:34]

DCHECK(thread_checker_.CalledOnValidThread());

[dspaid, 2016/05/13 01:19:24]

Done.

+  if (state != ArcBridgeService::State::STOPPED) {
+    return;
+  }
+  const user_manager::User* const primary_user =
+      user_manager::UserManager::Get()->GetPrimaryUser();
+  Profile* const profile =
+      chromeos::ProfileHelper::Get()->GetProfileByUser(primary_user);
+  ClearIfDisabled(profile);
+}
+
+void ArcDataManager::ClearIfDisabled(Profile* profile) {

[Daniel Erat, 2016/05/12 16:33:34]

DCHECK(thread_checker_.CalledOnValidThread());

[dspaid, 2016/05/13 01:19:24]

Done.

+  DCHECK(ArcBridgeService::Get()->state() == ArcBridgeService::State::STOPPED);
+  if (!profile->GetPrefs()->GetBoolean(prefs::kArcEnabled)) {

[Daniel Erat, 2016/05/12 16:33:34]

if you don't plan to ever call this from somewhere else, how about just moving
it into OnStateChanged?

[dspaid, 2016/05/13 01:19:24]

Its also called at login, and the enterprise team was interested in calling it
in some other instances.

+    chromeos::SessionManagerClient* session_manager_client =
+        chromeos::DBusThreadManager::Get()->GetSessionManagerClient();
+    session_manager_client->RemoveArcData();
+  }
+}
+
+}  // namespace arc