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

Unified Diff: chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc

Issue 856733004: Loading the Launcher with a Locked Profile launched UserManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use a testing profile manager Created 5 years, 11 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/app_list/app_list_service_interactive_uitest.cc
diff --git a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
index f8690d71d2cfab2defa6a590b125ddb1b68890ef..8a3a1dae27f42d05f83960983e69a7d5fa87bc54 100644
--- a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
@@ -23,6 +23,8 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/testing_browser_process.h"
+#include "chrome/test/base/testing_profile_manager.h"
#include "content/public/test/test_utils.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/search_box_model.h"
@@ -33,14 +35,21 @@
class AppListServiceInteractiveTest : public InProcessBrowserTest {
public:
AppListServiceInteractiveTest()
- : profile2_(NULL) {}
+ : profile2_(NULL),
+ profile_manager_(TestingBrowserProcess::GetGlobal()) {}
void InitSecondProfile() { profile2_ = test::CreateSecondProfileAsync(); }
+ void SetUp() override {
+ ASSERT_TRUE(profile_manager_.SetUp());
+ }
+
protected:
Profile* profile2_;
private:
+ TestingProfileManager profile_manager_;
+
DISALLOW_COPY_AND_ASSIGN(AppListServiceInteractiveTest);
};

Powered by Google App Engine
This is Rietveld 408576698