app_list: Add search box and search result view for v2.

chrome/browser/ui/views/ash/app_list/apps_model_builder_unittest.cc

Index: chrome/browser/ui/views/ash/app_list/apps_model_builder_unittest.cc
diff --git a/chrome/browser/ui/views/ash/app_list/app_list_model_builder_unittest.cc b/chrome/browser/ui/views/ash/app_list/apps_model_builder_unittest.cc
similarity index 60%
rename from chrome/browser/ui/views/ash/app_list/app_list_model_builder_unittest.cc
rename to chrome/browser/ui/views/ash/app_list/apps_model_builder_unittest.cc
index 37b5dfa8045550d4eba94133926c6b5ef1ecab62..83399ba224a133907fca4f89ee77688078029e98 100644
--- a/chrome/browser/ui/views/ash/app_list/app_list_model_builder_unittest.cc
+++ b/chrome/browser/ui/views/ash/app_list/apps_model_builder_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/views/ash/app_list/app_list_model_builder.h"
+#include "chrome/browser/ui/views/ash/app_list/apps_model_builder.h"
 
 #include <string>
 
@@ -26,8 +26,8 @@ class TestAppListItemModel : public app_list::AppListItemModel {
   DISALLOW_COPY_AND_ASSIGN(TestAppListItemModel);
 };
 
-// Get a string of all items in |model| joined with ','.
-std::string GetModelContent(app_list::AppListModel* model) {
+// Get a string of all apps in |model| joined with ','.
+std::string GetModelContent(app_list::AppListModel::Apps* model) {
   std::string content;
   for (size_t i = 0; i < model->item_count(); ++i) {
     if (i > 0)
@@ -39,13 +39,13 @@ std::string GetModelContent(app_list::AppListModel* model) {
 
 }  // namespace
 
-class AppListModelBuilderTest : public ExtensionServiceTestBase {
+class AppsModelBuilderTest : public ExtensionServiceTestBase {
  public:
-  AppListModelBuilderTest() {}
-  virtual ~AppListModelBuilderTest() {}
+  AppsModelBuilderTest() {}
+  virtual ~AppsModelBuilderTest() {}
 };
 
-TEST_F(AppListModelBuilderTest, GetExtensionApps) {
+TEST_F(AppsModelBuilderTest, GetExtensionApps) {
   // Load "app_list" extensions test profile. The test profile has 4 extensions:
   // 1 dummy extension, 2 packaged extension apps and 1 hosted extension app.
   FilePath source_install_dir = data_dir_
@@ -61,43 +61,43 @@ TEST_F(AppListModelBuilderTest, GetExtensionApps) {
   const ExtensionSet* extensions = service_->extensions();
   ASSERT_EQ(static_cast<size_t>(4),  extensions->size());
 
-  AppListModelBuilder builder(profile_.get());
+  AppsModelBuilder builder(profile_.get(), NULL);
 
-  AppListModelBuilder::Items items;
-  builder.GetExtensionApps(string16(), &items);
+  AppsModelBuilder::Apps apps;
+  builder.GetExtensionApps(&apps);
 
-  // The items list would have 3 extension apps in the profile.
-  EXPECT_EQ(static_cast<size_t>(3), items.size());
-  EXPECT_EQ("Hosted App", items[0]->title());
-  EXPECT_EQ("Packaged App 1", items[1]->title());
-  EXPECT_EQ("Packaged App 2", items[2]->title());
+  // The apps list would have 3 extension apps in the profile.
+  EXPECT_EQ(static_cast<size_t>(3), apps.size());
+  EXPECT_EQ("Hosted App", apps[0]->title());
+  EXPECT_EQ("Packaged App 1", apps[1]->title());
+  EXPECT_EQ("Packaged App 2", apps[2]->title());
 
-  STLDeleteElements(&items);
+  STLDeleteElements(&apps);
 }
 
-TEST_F(AppListModelBuilderTest, SortAndPopulateModel) {
+TEST_F(AppsModelBuilderTest, SortAndPopulateModel) {
   const char* kInput[] = {
     "CB", "Ca", "B", "a",
   };
   const char* kExpected = "a,B,Ca,CB";
 
-  scoped_ptr<app_list::AppListModel> model(new app_list::AppListModel());
+  scoped_ptr<app_list::AppListModel::Apps> model(
+      new app_list::AppListModel::Apps);
 
-  AppListModelBuilder::Items items;
+  AppsModelBuilder::Apps apps;
   for (size_t i = 0; i < arraysize(kInput); ++i)
-    items.push_back(new TestAppListItemModel(kInput[i]));
+    apps.push_back(new TestAppListItemModel(kInput[i]));
 
-  AppListModelBuilder builder(profile_.get());
-  builder.SetModel(model.get());
-  builder.SortAndPopulateModel(items);
+  AppsModelBuilder builder(profile_.get(), model.get());
+  builder.SortAndPopulateModel(apps);
 
   EXPECT_EQ(kExpected, GetModelContent(model.get()));
 }
 
-TEST_F(AppListModelBuilderTest, InsertItemByTitle) {
-  scoped_ptr<app_list::AppListModel> model(new app_list::AppListModel());
-  AppListModelBuilder builder(profile_.get());
-  builder.SetModel(model.get());
+TEST_F(AppsModelBuilderTest, InsertItemByTitle) {
+  scoped_ptr<app_list::AppListModel::Apps> model(
+      new app_list::AppListModel::Apps);
+  AppsModelBuilder builder(profile_.get(), model.get());
 
   const char* kInput[] = {
     "CB", "Ca", "B", "a", "z", "D"