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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month 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/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
index c4a97152863bc446c18038aba5895b8b436948e7..c9f144ccfcb877a7c5e6fe9ea5aa730909998a2f 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_ash_unittest.cc
@@ -13,7 +13,7 @@
#include "ui/views/window/dialog_delegate.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "components/arc/test/fake_arc_bridge_service.h"
#endif
@@ -32,11 +32,11 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
void SetUp() override {
ash::test::AshTestBase::SetUp();
#if defined(OS_CHROMEOS)
- arc::ArcAuthService::DisableUIForTesting();
+ arc::ArcSessionManager::DisableUIForTesting();
bridge_service_ = base::MakeUnique<arc::FakeArcBridgeService>();
- auth_service_ =
- base::MakeUnique<arc::ArcAuthService>(bridge_service_.get());
- auth_service_->OnPrimaryUserProfilePrepared(
+ arc_session_manager_ =
+ base::MakeUnique<arc::ArcSessionManager>(bridge_service_.get());
+ arc_session_manager_->OnPrimaryUserProfilePrepared(
extension_environment_.profile());
#endif
widget_ = views::DialogDelegate::CreateDialogWidget(
@@ -51,8 +51,8 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
void TearDown() override {
widget_->CloseNow();
#if defined(OS_CHROMEOS)
- if (auth_service_)
- auth_service_->Shutdown();
+ if (arc_session_manager_)
+ arc_session_manager_->Shutdown();
#endif
ash::test::AshTestBase::TearDown();
}
@@ -63,7 +63,7 @@ class AppInfoDialogAshTest : public ash::test::AshTestBase {
AppInfoDialog* dialog_ = nullptr; // Owned by |widget_|'s views hierarchy.
#if defined(OS_CHROMEOS)
std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;
- std::unique_ptr<arc::ArcAuthService> auth_service_;
+ std::unique_ptr<arc::ArcSessionManager> arc_session_manager_;
#endif
private:

Powered by Google App Engine
This is Rietveld 408576698