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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_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_views_unittest.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
index 534131722bc0ec1c6f4c71094fca0ab39a299443..589d9cb9e15f719826dbacd2b29518aaeecee646 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views_unittest.cc
@@ -24,7 +24,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
@@ -67,11 +67,11 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
void SetUp() override {
BrowserWithTestWindowTest::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(
@@ -92,9 +92,9 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
EXPECT_TRUE(widget_destroyed_);
extension_ = nullptr;
#if defined(OS_CHROMEOS)
- if (auth_service_) {
- auth_service_->Shutdown();
- auth_service_ = nullptr;
+ if (arc_session_manager_) {
+ arc_session_manager_->Shutdown();
+ arc_session_manager_ = nullptr;
}
#endif
BrowserWithTestWindowTest::TearDown();
@@ -107,9 +107,9 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
void DestroyProfile(TestingProfile* profile) override {
#if defined(OS_CHROMEOS)
- if (auth_service_) {
- auth_service_->Shutdown();
- auth_service_ = nullptr;
+ if (arc_session_manager_) {
+ arc_session_manager_->Shutdown();
+ arc_session_manager_ = nullptr;
}
#endif
}
@@ -138,7 +138,7 @@ class AppInfoDialogViewsTest : public BrowserWithTestWindowTest,
extensions::TestExtensionEnvironment extension_environment_;
#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