Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4656)

Unified Diff: chrome/browser/chromeos/arc/arc_auth_service_unittest.cc

Issue 2248353002: [M53 cherry-pick] Migrate ArcUserDataService into ArcAuthService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/arc/arc_auth_service_unittest.cc
diff --git a/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc b/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc
index ba30f6a48ddbe35fcfe5b6dc5ea472594e038e77..5618920c5924674b8ee5c2f5d83b0bc66554416f 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc
@@ -25,6 +25,7 @@
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
#include "chromeos/chromeos_switches.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/login/user_names.h"
#include "components/arc/arc_bridge_service.h"
#include "components/arc/test/fake_arc_bridge_service.h"
@@ -58,6 +59,8 @@ class ArcAuthServiceTest : public testing::Test {
~ArcAuthServiceTest() override = default;
void SetUp() override {
+ chromeos::DBusThreadManager::Initialize();
+
base::CommandLine::ForCurrentProcess()->AppendSwitch(
chromeos::switches::kEnableArc);
ArcAuthService::DisableUIForTesting();
@@ -86,7 +89,10 @@ class ArcAuthServiceTest : public testing::Test {
chromeos::WallpaperManager::Initialize();
}
- void TearDown() override { chromeos::WallpaperManager::Shutdown(); }
+ void TearDown() override {
+ chromeos::WallpaperManager::Shutdown();
+ chromeos::DBusThreadManager::Shutdown();
+ }
chromeos::FakeChromeUserManager* GetFakeUserManager() const {
return static_cast<chromeos::FakeChromeUserManager*>(
« no previous file with comments | « chrome/browser/chromeos/arc/arc_auth_service.cc ('k') | chrome/browser/chromeos/arc/arc_enterprise_reporting_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698