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

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

Issue 2723073002: Extract kArcEnabled preference from ArcSessionManager part 2. (Closed)
Patch Set: address comments Created 3 years, 10 months 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/ash/launcher/arc_app_launcher_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
index aea36ace4bb0911e119a2bc4f94c8c7f18977e4c..ffe1363a7119e202f95a7a63ed2acdf1bc00cc03 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -9,6 +9,8 @@
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/chromeos/arc/arc_auth_notification.h"
+#include "chrome/browser/chromeos/arc/arc_service_launcher.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/extensions/extension_browsertest.h"
@@ -165,6 +167,7 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {
void SetUpInProcessBrowserTestFixture() override {
ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
arc::ArcSessionManager::DisableUIForTesting();
+ arc::ArcAuthNotification::DisableForTesting();
}
void SetUpOnMainThread() override {
@@ -244,10 +247,8 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {
}
void StartInstance() {
- if (arc_session_manager()->profile() != profile()) {
- arc_session_manager()->SetProfile(profile());
- arc_session_manager()->StartPreferenceHandler();
- }
+ if (arc_session_manager()->profile() != profile())
+ arc::ArcServiceLauncher::Get()->OnPrimaryUserProfilePrepared(profile());
app_instance_observer()->OnInstanceReady();
}
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_test.cc ('k') | chrome/browser/ui/views/arc_app_dialog_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698