Add profile selector menu to app list.

chrome/browser/ui/app_list/app_list_controller_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "base/files/scoped_temp_dir.h"
+#include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 // Browser Test for AppListController that runs on all platforms supporting
 // app_list.
 class AppListControllerBrowserTest : public InProcessBrowserTest {
  public:
   AppListControllerBrowserTest()
     : profile2_(NULL) {}
 
+  void InitSecondProfile() {
+    ProfileManager* profile_manager = g_browser_process->profile_manager();
+    base::FilePath temp_profile_dir =
+        profile_manager->user_data_dir().AppendASCII("Profile 1");
+    profile_manager->CreateProfileAsync(

[tapted, 2013/09/16 20:46:44]

Will the path created by this call get deleted when the test ends? tests in
profile_browsertest.cc all use scoped paths. It could be the case that
everything under the user data dir is deleted reliably, but I've never confirmed
this, and we are not allowed to leave junk around..

You can perhaps just leave the data member in and use
temp_profile_dir_.Set(profile_manager->user_data_dir().AppendASCII("Profile
1"));

[calamity, 2013/09/17 00:09:26]

user_data_dir is a scoped_temp_dir and those are deleted recursively.

+        temp_profile_dir,
+        base::Bind(&AppListControllerBrowserTest::OnProfileCreated,
+                   this),
+        string16(), string16(), std::string());
+    content::RunMessageLoop();  // Will stop in OnProfileCreated().
+  }
+
   void OnProfileCreated(Profile* profile, Profile::CreateStatus status) {
     if (status == Profile::CREATE_STATUS_INITIALIZED) {
       profile2_ = profile;
       base::MessageLoop::current()->Quit();
     }
   }
 
  protected:
-  base::ScopedTempDir temp_profile_dir_;
   Profile* profile2_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListControllerBrowserTest);
 };
 
 // Test the CreateNewWindow function of the controller delegate.
 IN_PROC_BROWSER_TEST_F(AppListControllerBrowserTest, CreateNewWindow) {
   const chrome::HostDesktopType desktop = chrome::GetActiveDesktop();
   AppListService* service = AppListService::Get();
@@ skipping 18 matching lines @@
 IN_PROC_BROWSER_TEST_F(AppListControllerBrowserTest, ShowAndDismiss) {
   AppListService* service = AppListService::Get();
   ASSERT_FALSE(service->IsAppListVisible());
   service->ShowForProfile(browser()->profile());
   ASSERT_TRUE(service->IsAppListVisible());
   service->DismissAppList();
   ASSERT_FALSE(service->IsAppListVisible());
 }
 
 IN_PROC_BROWSER_TEST_F(AppListControllerBrowserTest, SwitchAppListProfiles) {
-  ProfileManager* profile_manager = g_browser_process->profile_manager();
-  ASSERT_TRUE(temp_profile_dir_.CreateUniqueTempDir());
-  profile_manager->CreateProfileAsync(
-      temp_profile_dir_.path(),
-      base::Bind(&AppListControllerBrowserTest::OnProfileCreated,
-                 this),
-      string16(), string16(), std::string());
-  content::RunMessageLoop();  // Will stop in OnProfileCreated().
+  InitSecondProfile();
 
   AppListService* service = AppListService::Get();
+  scoped_ptr<test::AppListServiceTestApi> test_api(
+      test::AppListServiceTestApi::Create(chrome::HOST_DESKTOP_TYPE_NATIVE));
+  ASSERT_TRUE(service);
+  ASSERT_TRUE(test_api);
+
+  scoped_ptr<AppListControllerDelegate> controller(
+      service->CreateControllerDelegate());
+  ASSERT_TRUE(controller);
+
+  // Open the app list with the browser's profile.
   ASSERT_FALSE(service->IsAppListVisible());
-  service->ShowForProfile(browser()->profile());
+  controller->ShowForProfileByPath(browser()->profile()->GetPath());
+  app_list::AppListModel* model = test_api->GetAppListModel();
+  ASSERT_TRUE(model);
+  model->SetSignedIn(true);
+  base::RunLoop().RunUntilIdle();
+
   ASSERT_TRUE(service->IsAppListVisible());
   ASSERT_EQ(browser()->profile(), service->GetCurrentAppListProfile());
-  service->ShowForProfile(profile2_);
+
+  // Open the app list with the second profile.
+  controller->ShowForProfileByPath(profile2_->GetPath());
+  model = test_api->GetAppListModel();
+  ASSERT_TRUE(model);
+  model->SetSignedIn(true);
+  base::RunLoop().RunUntilIdle();
+
   ASSERT_TRUE(service->IsAppListVisible());
   ASSERT_EQ(profile2_, service->GetCurrentAppListProfile());
-  service->DismissAppList();
+
+  controller->DismissView();
+}
+
+IN_PROC_BROWSER_TEST_F(AppListControllerBrowserTest,
+                       SwitchAppListProfilesDuringSearch) {

[tapted, 2013/09/16 20:46:44]

This shouldn't be appearing anew in the diff - you might need to fix your
upstream.

+  InitSecondProfile();
+
+  AppListService* service = AppListService::Get();
+  scoped_ptr<test::AppListServiceTestApi> test_api(
+      test::AppListServiceTestApi::Create(chrome::HOST_DESKTOP_TYPE_NATIVE));
+  ASSERT_TRUE(service);
+  ASSERT_TRUE(test_api);
+
+  scoped_ptr<AppListControllerDelegate> controller(
+      service->CreateControllerDelegate());
+  ASSERT_TRUE(controller);
+
+  // Set a search with original profile.
+  controller->ShowForProfileByPath(browser()->profile()->GetPath());
+  app_list::AppListModel* model = test_api->GetAppListModel();
+  ASSERT_TRUE(model);
+  model->SetSignedIn(true);
+  model->search_box()->SetText(ASCIIToUTF16("minimal"));
+  base::RunLoop().RunUntilIdle();
+
+  // Switch to the second profile.
+  controller->ShowForProfileByPath(profile2_->GetPath());
+  model = test_api->GetAppListModel();
+  ASSERT_TRUE(model);
+  model->SetSignedIn(true);
+  base::RunLoop().RunUntilIdle();
+
+  // Ensure the search box is empty.
+  ASSERT_TRUE(model->search_box()->text().empty());
+  ASSERT_EQ(profile2_, service->GetCurrentAppListProfile());
+
+  controller->DismissView();
   ASSERT_FALSE(service->IsAppListVisible());
 }
 
 class ShowAppListBrowserTest : public InProcessBrowserTest {
  public:
   ShowAppListBrowserTest() {}
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kShowAppList);
   }
@@ skipping 133 matching lines @@
   // Results should not be immediately refreshed. When they are, the item should
   // be removed from the model.
   EXPECT_TRUE(observed_result_);
   base::RunLoop().RunUntilIdle();
   EXPECT_FALSE(observed_result_);
   StopWatchingResults();
   service->DismissAppList();
 }
 
 }  // namespace