Clear Search results in the Mac app launcher on close, rather than launch.

ui/app_list/cocoa/app_list_window_controller_unittest.mm

Index: ui/app_list/cocoa/app_list_window_controller_unittest.mm
diff --git a/ui/app_list/cocoa/app_list_window_controller_unittest.mm b/ui/app_list/cocoa/app_list_window_controller_unittest.mm
index 68b273d71a28410a9e3a23f8499fb66d23a254e0..ef13932ec7c020081796e9d1a3218eea2859d143 100644
--- a/ui/app_list/cocoa/app_list_window_controller_unittest.mm
+++ b/ui/app_list/cocoa/app_list_window_controller_unittest.mm
@@ -3,10 +3,12 @@
 // found in the LICENSE file.
 
 #import "base/mac/scoped_nsobject.h"
+#include "base/strings/utf_string_conversions.h"
 #import "testing/gtest_mac.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #import "ui/app_list/cocoa/app_list_view_controller.h"
 #import "ui/app_list/cocoa/app_list_window_controller.h"
+#include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
@@ -68,3 +70,24 @@ TEST_F(AppListWindowControllerTest, DismissWithEscape) {
   [[controller_ window] cancelOperation:controller_];
   EXPECT_EQ(1, delegate()->dismiss_count());
 }
+
+// Test that search results are cleared when the window closes, and not before.

[koz (OOO until 15th September), 2013/12/02 22:49:45]

Maybe elaborate here like "Test that search results are cleared when the window
closes, not when a search result is selected. Clearing the search when a search
result is selected means that we will see the search results slide away while
the window closes, which looks weird."

[tapted, 2013/12/03 01:45:26]

Done.

+TEST_F(AppListWindowControllerTest, CloseClearsSearch) {
+  [[controller_ window] makeKeyAndOrderFront:nil];
+  app_list::SearchBoxModel* model = delegate()->GetModel()->search_box();
+  AppListViewController* view_controller = [controller_ appListViewController];
+
+  EXPECT_FALSE([view_controller showingSearchResults]);
+
+  const base::string16 search_text(ASCIIToUTF16("test"));
+  model->SetText(search_text);
+  EXPECT_TRUE([view_controller showingSearchResults]);
+
+  EXPECT_EQ(0, delegate()->open_search_result_count());
+  [view_controller openResult:nil];
+  EXPECT_EQ(1, delegate()->open_search_result_count());
+
+  EXPECT_TRUE([view_controller showingSearchResults]);
+  [[controller_ window] close];  // Hide.
+  EXPECT_FALSE([view_controller showingSearchResults]);
+}