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

Unified Diff: chrome/browser/chromeos/arc/arc_session_manager_browsertest.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/chromeos/arc/arc_session_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc b/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
index 8ca0fd5c89f5c2601cb718af56acf9db0cee2069..24c24d5d1214b9d14c39a2a36a6df1f4ee22b60c 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
@@ -154,10 +154,6 @@ class ArcSessionManagerTest : public InProcessBrowserTest {
chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
std::unique_ptr<chromeos::SessionManagerClient>(
fake_session_manager_client));
-
- // Mock out ARC instance.
- ArcServiceManager::SetArcSessionRunnerForTesting(
- base::MakeUnique<ArcSessionRunner>(base::Bind(FakeArcSession::Create)));
}
void SetUpOnMainThread() override {
@@ -166,6 +162,8 @@ class ArcSessionManagerTest : public InProcessBrowserTest {
// Init ArcSessionManager for testing.
ArcSessionManager::DisableUIForTesting();
ArcSessionManager::EnableCheckAndroidManagementForTesting();
+ ArcSessionManager::Get()->SetArcSessionRunnerForTesting(
+ base::MakeUnique<ArcSessionRunner>(base::Bind(FakeArcSession::Create)));
EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
« no previous file with comments | « chrome/browser/chromeos/arc/arc_session_manager.cc ('k') | chrome/browser/chromeos/arc/arc_session_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698