Elim ActivateAppListItem, ChromeAppListItem

ui/app_list/cocoa/apps_grid_controller_unittest.mm

 // 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 "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "testing/gtest_mac.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 191 matching lines @@
   NSArray* subviews = [GetPageAt(0) subviews];
   EXPECT_EQ(1u, [subviews count]);
 
   // Note that using GetItemViewAt(0) here also works, and returns non-nil even
   // without the delay, but a "click" on it does not register without the delay.
   NSView* subview = [subviews objectAtIndex:0];
 
   // Launch the item.
   SimulateClick(subview);
   SinkEvents();
-  EXPECT_EQ(1, delegate()->activate_count());
-  EXPECT_EQ(std::string("Item 0"), delegate()->last_activated()->title());
+  EXPECT_EQ(1, model()->activate_count());
+  ASSERT_TRUE(model()->last_activated());
+  EXPECT_EQ(std::string("Item 0"), model()->last_activated()->title());
 }
 
 // Test activating an item on the second page (the 17th item).
 TEST_F(AppsGridControllerTest, DISABLED_TwoPageModel) {
   DelayForCollectionView();
   ReplaceTestModel(kItemsPerPage * 2);
   [apps_grid_controller_ scrollToPage:1];
 
   // The NSScrollView animator ignores the duration configured on the
   // NSAnimationContext (set by CocoaTest::Init), so we need to delay here.
   DelayForCollectionView();
   NSArray* subviews = [GetPageAt(1) subviews];
   NSView* subview = [subviews objectAtIndex:0];
   // Launch the item.
   SimulateClick(subview);
   SinkEvents();
-  EXPECT_EQ(1, delegate()->activate_count());
-  EXPECT_EQ(std::string("Item 16"), delegate()->last_activated()->title());
+  EXPECT_EQ(1, model()->activate_count());
+  ASSERT_TRUE(model()->last_activated());
+  EXPECT_EQ(std::string("Item 16"), model()->last_activated()->title());
 }
 
 // Test setModel.
 TEST_F(AppsGridControllerTest, ReplaceModel) {
   const size_t kOrigItems = 1;
   const size_t kNewItems = 2;
 
   model()->PopulateApps(kOrigItems);
   EXPECT_EQ(kOrigItems, [[GetPageAt(0) content] count]);
 
@@ skipping 66 matching lines @@
   EXPECT_EQ(4u, [apps_grid_controller_ selectedItemIndex]);
 
   SimulateKeyAction(@selector(moveUp:));
   EXPECT_EQ(0u, [apps_grid_controller_ selectedItemIndex]);
 
   // Go to the third item, and launch it.
   SimulateKeyAction(@selector(moveRight:));
   SimulateKeyAction(@selector(moveRight:));
   EXPECT_EQ(2u, [apps_grid_controller_ selectedItemIndex]);
   SimulateKeyAction(@selector(insertNewline:));
-  EXPECT_EQ(1, delegate()->activate_count());
-  EXPECT_EQ(std::string("Item 2"), delegate()->last_activated()->title());
+  EXPECT_EQ(1, model()->activate_count());
+  ASSERT_TRUE(model()->last_activated());
+  EXPECT_EQ(std::string("Item 2"), model()->last_activated()->title());
 }
 
 // Tests keyboard navigation across pages.
 TEST_F(AppsGridControllerTest, CrossPageKeyboardNavigation) {
   model()->PopulateApps(kItemsPerPage + 10);
   EXPECT_EQ(kItemsPerPage, [[GetPageAt(0) content] count]);
   EXPECT_EQ(10u, [[GetPageAt(1) content] count]);
 
   // Moving Left, Up, or PageUp from the top-left corner of the first page does
   // nothing.
@@ skipping 590 matching lines @@
   EXPECT_EQ(nil, menu);
 
   item_two_model->SetMenuReadyForTesting(true);
   menu = [page menuForEvent:mouse_at_cell_1];
   EXPECT_EQ(1, [menu numberOfItems]);
   EXPECT_NSEQ(@"Menu For: Item Two", [[menu itemAtIndex:0] title]);
 }
 
 }  // namespace test
 }  // namespace app_list