[M53 cherry-pick] Migrate ArcUserDataService into ArcAuthService.

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

Index: chrome/browser/ui/app_list/arc/arc_app_test.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_app_test.cc b/chrome/browser/ui/app_list/arc/arc_app_test.cc
index 4c97ec05ff2999bf7e5039e9eb4e3b91d6ef2ccc..e75719223f6ac424e293a2acc0b33356233f3e4d 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/test/fake_app_instance.h"
 #include "components/arc/test/fake_arc_bridge_service.h"
@@ -47,6 +48,10 @@ chromeos::FakeChromeUserManager* ArcAppTest::GetUserManager() {
 }
 
 void ArcAppTest::SetUp(Profile* profile) {
+  if (!chromeos::DBusThreadManager::IsInitialized()) {
+    chromeos::DBusThreadManager::Initialize();
+    dbus_thread_manager_initialized_ = true;
+  }
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableArc);
   DCHECK(!profile_);
@@ -123,6 +128,13 @@ void ArcAppTest::SetUp(Profile* profile) {
 
 void ArcAppTest::TearDown() {
   auth_service_.reset();
+  if (dbus_thread_manager_initialized_) {
+    // DBusThreadManager may be initialized from other testing utility,
+    // such as ash::test::AshTestHelper::SetUp(), so Shutdown() only when
+    // it is initialized in ArcAppTest::SetUp().
+    chromeos::DBusThreadManager::Shutdown();
+    dbus_thread_manager_initialized_ = false;
+  }
 }
 
 void ArcAppTest::StopArcInstance() {