Revert of [M53 cherry-pick] Migrate ArcUserDataService into ArcAuthService.

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

 // 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/ui/app_list/arc/arc_app_test.h"
 
 #include "base/command_line.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 constexpr char kPackageName1[] = "fakepackagename1";
 constexpr char kPackageName2[] = "fakepackagename2";
 constexpr char kPackageName3[] = "fakepackagename3";
@@ skipping 15 matching lines @@
 
 ArcAppTest::~ArcAppTest() {
 }
 
 chromeos::FakeChromeUserManager* ArcAppTest::GetUserManager() {
   return static_cast<chromeos::FakeChromeUserManager*>(
       user_manager::UserManager::Get());
 }
 
 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_);
   profile_ = profile;
   CreateUserAndLogin();
 
   // Make sure we have enough data for test.
   for (int i = 0; i < 3; ++i) {
     arc::mojom::AppInfo app;
     app.name = base::StringPrintf("Fake App %d", i);
@@ skipping 56 matching lines @@
 
   arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
   DCHECK(arc_app_list_pref_);
 
   app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
   bridge_service_->app()->SetInstance(app_instance_.get());
 }
 
 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() {
   bridge_service_->app()->CloseChannel();
 }
 
 void ArcAppTest::RestartArcInstance() {
   bridge_service_->app()->CloseChannel();
   app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
   bridge_service_->app()->SetInstance(app_instance_.get());
@@ skipping 21 matching lines @@
   }
 }
 
 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) {
   for (auto fake_package : fake_packages_) {
     if (package.package_name == fake_package.package_name)
       return true;
   }
   return false;
 }