Mac bookmark mgr: Restore previously selected group when search field is cleared.

chrome/browser/cocoa/bookmark_manager_controller_unittest.mm

Index: chrome/browser/cocoa/bookmark_manager_controller_unittest.mm
diff --git a/chrome/browser/cocoa/bookmark_manager_controller_unittest.mm b/chrome/browser/cocoa/bookmark_manager_controller_unittest.mm
index 50c23575389aec5ba054968cce7e9e3dc8d1a972..5f5c4cba86e4b9d0905599613f30ff6b1a14376f 100644
--- a/chrome/browser/cocoa/bookmark_manager_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_manager_controller_unittest.mm
@@ -42,6 +42,11 @@ class BookmarkManagerControllerTest : public CocoaTest {
         nil];
   }
 
+  bool SearchResultsVisible() {
+    NSOutlineView* outline = [[controller_ groupsController] outline];
+    return [outline rowForItem:[controller_ searchGroup]] >= 0;
+  }
+
   BrowserTestHelper browser_test_helper_;
   BookmarkManagerController* controller_;
 };
@@ -120,4 +125,37 @@ TEST_F(BookmarkManagerControllerTest, Search) {
   EXPECT_EQ(0U, [shown count]);
 }
 
+TEST_F(BookmarkManagerControllerTest, SearchSelection) {
+  BookmarkTreeController* groupsController = [controller_ groupsController];
+  AddFixtureItems();
+  BookmarkItem* originalSelection = [controller_ bookmarkBarItem];
+  EXPECT_FALSE(SearchResultsVisible());
+  EXPECT_EQ(originalSelection, [groupsController selectedItem]);
+
+  // Start a search and verify the search results group is selected.
+  [controller_ setSearchString:@"g"];
+  EXPECT_TRUE(SearchResultsVisible());
+  EXPECT_EQ([controller_ searchGroup], [groupsController selectedItem]);
+
+  // Type some more, see if updating the search string works.
+  [controller_ setSearchString:@"gmail"];
+  EXPECT_TRUE(SearchResultsVisible());
+  EXPECT_EQ([controller_ searchGroup], [groupsController selectedItem]);
+
+  // Clear search, verify search results are hidden and original sel restored.
+  [controller_ setSearchString:@""];
+  EXPECT_FALSE(SearchResultsVisible());
+  EXPECT_EQ(originalSelection, [groupsController selectedItem]);
+
+  // Now search, then change the selection, then clear search:
+  [controller_ setSearchString:@"gmail"];
+  EXPECT_TRUE(SearchResultsVisible());
+  EXPECT_EQ([controller_ searchGroup], [groupsController selectedItem]);
+  BookmarkItem* newerSelection = [controller_ otherBookmarksItem];
+  [controller_ showGroup:newerSelection];
+  [controller_ setSearchString:@""];
+  EXPECT_FALSE(SearchResultsVisible());
+  EXPECT_EQ(newerSelection, [groupsController selectedItem]);
+}
+
 }  // namespace