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

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

Issue 2531543003: Resolve initialize/destory order between ArcService and ArcSessionManager. (Closed)
Patch Set: Address comments. 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/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 3276ae7de033645809bcbe10e85df4aa34fa30da..e8f90f171ad1fc1adbed7f77392209d89ec88bbf 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager_browsertest.cc
@@ -13,6 +13,7 @@
#include "base/run_loop.h"
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/arc/arc_service_launcher.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
@@ -159,13 +160,7 @@ class ArcSessionManagerTest : public InProcessBrowserTest {
GetFakeUserManager()->LoginUser(account_id);
// Set up ARC for test profile.
- std::unique_ptr<BooleanPrefMember> arc_enabled_pref =
- base::MakeUnique<BooleanPrefMember>();
- arc_enabled_pref->Init(prefs::kArcEnabled, profile()->GetPrefs());
- ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
- multi_user_util::GetAccountIdFromProfile(profile()),
- std::move(arc_enabled_pref));
- ArcSessionManager::Get()->OnPrimaryUserProfilePrepared(profile());
+ ArcServiceLauncher::Get()->OnPrimaryUserProfilePrepared(profile());
}
void TearDownOnMainThread() override {
« no previous file with comments | « chrome/browser/chromeos/arc/arc_service_launcher.cc ('k') | chrome/browser/chromeos/login/session/chrome_session_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698