Make app list return to previous page after search.

ui/app_list/views/app_list_view_unittest.cc

 // Copyright 2014 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 "ui/app_list/views/app_list_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 425 matching lines @@
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   AppListTestModel* model = delegate_->GetTestModel();
   model->PopulateApps(3);
 
   Show();
 
   AppListMainView* main_view = view_->app_list_main_view();
   ContentsView* contents_view = main_view->contents_view();
   ShowContentsViewPageAndVerify(
       contents_view->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_APPS));
-  EXPECT_TRUE(IsViewAtOrigin(contents_view->apps_container_view()));
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   // Show the search results.
   contents_view->ShowSearchResults(true);
   contents_view->Layout();
   EXPECT_TRUE(contents_view->IsShowingSearchResults());
   EXPECT_TRUE(main_view->search_box_view()->visible());
 
   if (test_type_ == EXPERIMENTAL) {
     EXPECT_TRUE(
         contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_START));
     EXPECT_TRUE(IsViewAtOrigin(contents_view->start_page_view()));
   } else {
     EXPECT_TRUE(contents_view->IsNamedPageActive(
         ContentsView::NAMED_PAGE_SEARCH_RESULTS));
     EXPECT_TRUE(IsViewAtOrigin(contents_view->search_results_view()));
   }
 
   // Hide the search results.
   contents_view->ShowSearchResults(false);
   contents_view->Layout();
   EXPECT_FALSE(contents_view->IsShowingSearchResults());
-  if (test_type_ == EXPERIMENTAL) {
-    EXPECT_TRUE(
-        contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_START));
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->start_page_view()));
-    EXPECT_FALSE(main_view->search_box_view()->visible());
-  } else {
-    EXPECT_TRUE(
-        contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_APPS));
-    EXPECT_TRUE(IsViewAtOrigin(contents_view->apps_container_view()));
-    EXPECT_TRUE(main_view->search_box_view()->visible());
-  }
+
+  // Check that we return to the page that we were on before the search.
+  EXPECT_TRUE(contents_view->IsNamedPageActive(ContentsView::NAMED_PAGE_APPS));
+  EXPECT_TRUE(IsViewAtOrigin(contents_view->apps_container_view()));
+  EXPECT_TRUE(main_view->search_box_view()->visible());
 
   if (test_type_ == EXPERIMENTAL) {
+    ShowContentsViewPageAndVerify(contents_view->GetPageIndexForNamedPage(
+        ContentsView::NAMED_PAGE_START));
+
     // Check that typing into the dummy search box triggers the search page.
     base::string16 search_text = base::UTF8ToUTF16("test");
     SearchBoxView* dummy_search_box =
         contents_view->start_page_view()->dummy_search_box_view();
     EXPECT_TRUE(dummy_search_box->IsDrawn());
     dummy_search_box->search_box()->InsertText(search_text);
     contents_view->Layout();
     // Check that the current search is using |search_text|.
     EXPECT_EQ(search_text, delegate_->GetTestModel()->search_box()->text());
     EXPECT_TRUE(contents_view->IsShowingSearchResults());
@@ skipping 176 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list