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

Unified Diff: chrome/browser/ui/app_list/arc/arc_app_test.cc

Issue 2596273002: Move ArcSessionRunner from ArcBridgeService to ArcSessionManager. (Closed)
Patch Set: Rebase and update comments. Created 4 years 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/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 1a9d9581990b5c7bd7d134e68bea1e611a6caa40..0d21c988032617f7a7fbf1b3c439e12c2b11c2dc 100644
--- a/chrome/browser/ui/app_list/arc/arc_app_test.cc
+++ b/chrome/browser/ui/app_list/arc/arc_app_test.cc
@@ -79,12 +79,10 @@ void ArcAppTest::SetUp(Profile* profile) {
ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting(
profile_);
}
- arc::ArcServiceManager::SetArcSessionRunnerForTesting(
- base::MakeUnique<arc::ArcSessionRunner>(
- base::Bind(arc::FakeArcSession::Create)));
arc_service_manager_ = base::MakeUnique<arc::ArcServiceManager>(nullptr);
arc_session_manager_ = base::MakeUnique<arc::ArcSessionManager>(
- arc_service_manager_->arc_bridge_service());
+ base::MakeUnique<arc::ArcSessionRunner>(
+ base::Bind(arc::FakeArcSession::Create)));
DCHECK(arc::ArcSessionManager::Get());
arc::ArcSessionManager::DisableUIForTesting();
arc_session_manager_->OnPrimaryUserProfilePrepared(profile_);
@@ -96,12 +94,12 @@ void ArcAppTest::SetUp(Profile* profile) {
run_loop.Run();
arc_session_manager_->EnableArc();
+ // Check initial conditions.
+ EXPECT_FALSE(arc_session_manager_->IsSessionRunning());
+
app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
arc_service_manager_->arc_bridge_service()->app()->SetInstance(
app_instance_.get());
-
- // Check initial conditions.
- EXPECT_FALSE(arc_service_manager_->arc_bridge_service()->ready());
}
void ArcAppTest::CreateFakeAppsAndPackages() {

Powered by Google App Engine
This is Rietveld 408576698