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

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

Issue 1128173005: Clean up ProfileManager interface. Base URL: https://chromium.googlesource.com/chromium/src@issue479309
Patch Set: sync Created 5 years, 7 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_impl_browsertest.cc
diff --git a/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc b/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc
index 3d75ba9585f874e5fe9ccae7403c6c90e9b20958..512a787b88302587a55edf7d91812184133a0380 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc
@@ -67,10 +67,7 @@ IN_PROC_BROWSER_TEST_F(AppListServiceImplBrowserTest,
EXPECT_FALSE(local_state->HasPrefPath(prefs::kAppListProfile));
// When never shown, profile path should match the last used profile.
- base::FilePath user_data_dir =
- g_browser_process->profile_manager()->user_data_dir();
- EXPECT_EQ(service_->GetProfilePath(user_data_dir),
- browser()->profile()->GetPath());
+ EXPECT_EQ(service_->GetProfilePath(), browser()->profile()->GetPath());
// Just requesting the profile path shouldn't set it.
EXPECT_FALSE(local_state->HasPrefPath(prefs::kAppListProfile));
@@ -108,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(AppListServiceImplBrowserTest,
// Current profile and saved path should update synchronously.
EXPECT_FALSE(test_api_->profile_loader()->IsAnyProfileLoading());
- EXPECT_EQ(profile2->GetPath(), service_->GetProfilePath(user_data_dir));
+ EXPECT_EQ(profile2->GetPath(), service_->GetProfilePath());
EXPECT_EQ(profile2, service_->GetCurrentAppListProfile());
#endif
}
« no previous file with comments | « chrome/browser/ui/app_list/app_list_service_impl.cc ('k') | chrome/browser/ui/app_list/app_list_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698