Move ownership of the AppListViewDelegate into the AppListService

chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc

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 a54b8ced6734fffd33ad6d5b853424675e1bcf07..10b4810a203be6445c934e9345d301cdcee09b28 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
@@ -7,6 +7,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/app_list/app_list_view_delegate.h"
 #include "chrome/browser/ui/app_list/test/chrome_app_list_test_support.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
@@ -20,6 +21,7 @@ class AppListServiceImplTestApi {
   explicit AppListServiceImplTestApi(AppListServiceImpl* impl) : impl_(impl) {}
 
   ProfileLoader* profile_loader() { return impl_->profile_loader_.get(); }
+  AppListViewDelegate* view_delegate() { return impl_->view_delegate_.get(); }
 
  private:
   AppListServiceImpl* impl_;
@@ -102,3 +104,47 @@ IN_PROC_BROWSER_TEST_F(AppListServiceImplBrowserTest, ShowLoadedProfiles) {
   EXPECT_EQ(profile2, service_->GetCurrentAppListProfile());
 #endif
 }
+
+// Tests that the AppListViewDelegate is created lazily.
+IN_PROC_BROWSER_TEST_F(AppListServiceImplBrowserTest, CreatedLazily) {
+  EXPECT_FALSE(test_api_->view_delegate());
+  service_->ShowForProfile(browser()->profile());
+  EXPECT_TRUE(test_api_->view_delegate());
+}
+
+// Tests that deleting a profile properly clears the app list view delegate, but
+// doesn't destroy it. Disabled on ChromeOS, since profiles can't be deleted
+// this way (the second profile isn't signed in, so the test fails when creating
+// UserCloudPolicyManagerChromeOS).
+#if defined(OS_CHROMEOS)
+#define MAYBE_DeletingProfileUpdatesViewDelegate \
+    DISABLED_DeletingProfileUpdatesViewDelegate
+#else
+#define MAYBE_DeletingProfileUpdatesViewDelegate \
+    DeletingProfileUpdatesViewDelegate
+#endif
+IN_PROC_BROWSER_TEST_F(AppListServiceImplBrowserTest,
+                       MAYBE_DeletingProfileUpdatesViewDelegate) {
+  Profile* second_profile = test::CreateSecondProfileAsync();

[James Cook, 2014/09/18 23:29:56]

Not for this CL: CreateSecondProfileAsync() is kind of an odd name -- when I
read the test it looks like it is doing something async and the test isn't
waiting for it.  But it is actually a synchronous call.  It just reads oddly.

[tapted, 2014/09/19 00:49:01]

good point - I agree it's confusing. It's named this way because it calls
ProfileManager::CreateProfileAsync() (which is asynchronous). The asynchrony is
encapsulated here, but it's important for app list tests to know a run loop is
being spun up since if that happens while the app list is showing, it can cause
the app list to be dismissed and make flaky tests. I'll fix this in a follow-up.

+  service_->ShowForProfile(second_profile);
+  AppListViewDelegate* view_delegate = test_api_->view_delegate();
+
+  EXPECT_TRUE(view_delegate);
+  EXPECT_EQ(view_delegate->profile(), second_profile);
+
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+
+  // Delete the profile being used by the app list.
+  profile_manager->ScheduleProfileForDeletion(second_profile->GetPath(),
+                                              ProfileManager::CreateCallback());
+
+  // View delegate doesn't change when changing profiles.
+  EXPECT_EQ(view_delegate, test_api_->view_delegate());
+
+  // But the profile gets cleared until shown again.
+  EXPECT_FALSE(view_delegate->profile());
+  service_->ShowForProfile(browser()->profile());
+
+  EXPECT_EQ(view_delegate, test_api_->view_delegate());
+  EXPECT_EQ(view_delegate->profile(), browser()->profile());
+}