Move app list search box into AppListView.

ui/app_list/views/app_list_main_view_unittest.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 "ui/app_list/views/app_list_main_view.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_item_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_view.h"
+#include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view_model.h"
 #include "ui/views/widget/widget.h"
 
 namespace app_list {
 namespace test {
 
 namespace {
 
@@ skipping 43 matching lines @@
   virtual void SetUp() override {
     views::ViewsTestBase::SetUp();
     delegate_.reset(new AppListTestViewDelegate);
 
     // In Ash, the third argument is a container aura::Window, but it is always
     // NULL on Windows, and not needed for tests. It is only used to determine
     // the scale factor for preloading icons.
     main_view_ = new AppListMainView(delegate_.get());
     main_view_->SetPaintToLayer(true);
     main_view_->model()->SetFoldersEnabled(true);
-    main_view_->Init(NULL, 0);
+    search_box_view_.reset(new SearchBoxView(main_view_, delegate_.get()));
+    main_view_->Init(NULL, 0, search_box_view_.get());
 
     widget_ = new views::Widget;
     views::Widget::InitParams params =
         CreateParams(views::Widget::InitParams::TYPE_POPUP);
     params.bounds.set_size(main_view_->GetPreferredSize());
     widget_->Init(params);
 
     widget_->SetContentsView(main_view_);
   }
 
   virtual void TearDown() override {
     widget_->Close();
     views::ViewsTestBase::TearDown();
+    search_box_view_.reset();
     delegate_.reset();
   }
 
   // |point| is in |grid_view|'s coordinates.
   AppListItemView* GetItemViewAtPointInGrid(AppsGridView* grid_view,
                                             const gfx::Point& point) {
     const views::ViewModelT<AppListItemView>* view_model =
         grid_view->view_model_for_test();
     for (int i = 0; i < view_model->view_size(); ++i) {
       views::View* view = view_model->view_at(i);
@@ skipping 116 matching lines @@
     EXPECT_TRUE(RootGridView()->visible());
     EXPECT_EQ(0, FolderView()->layer()->opacity());
 
     return dragged;
   }
 
  protected:
   views::Widget* widget_;  // Owned by native window.
   AppListMainView* main_view_;  // Owned by |widget_|.
   scoped_ptr<AppListTestViewDelegate> delegate_;
+  scoped_ptr<SearchBoxView> search_box_view_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListMainViewTest);
 };
 
 }  // namespace
 
 // Tests changing the AppListModel when switching profiles.
 TEST_F(AppListMainViewTest, ModelChanged) {
   delegate_->GetTestModel()->PopulateApps(kInitialItems);
@@ skipping 91 matching lines @@
 
   // Additional mouse move operations should be ignored.
   gfx::Point point(1, 1);
   SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
   EXPECT_FALSE(RootGridView()->has_dragged_view());
   EXPECT_FALSE(FolderGridView()->has_dragged_view());
 }
 
 }  // namespace test
 }  // namespace app_list