Move app list

ash/test/launcher_view_test_api.cc

 // Copyright (c) 2012 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 "ash/test/launcher_view_test_api.h"
 
 #include "ash/launcher/launcher_button.h"
+#include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/launcher/overflow_button.h"
 #include "base/message_loop.h"
 #include "ui/views/animation/bounds_animator.h"
 #include "ui/views/view_model.h"
 
 namespace {
 
 // A class used to wait for animations.
 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
@@ skipping 23 matching lines @@
 
 LauncherViewTestAPI::~LauncherViewTestAPI() {
 }
 
 int LauncherViewTestAPI::GetButtonCount() {
   return launcher_view_->view_model_->view_size();
 }
 
 internal::LauncherButton* LauncherViewTestAPI::GetButton(int index) {
   // App list button is not a LauncherButton.
-  if (index == GetButtonCount() - 1)
+  if (launcher_view_->model_->items()[index].type == ash::TYPE_APP_LIST)
     return NULL;
 
   return static_cast<internal::LauncherButton*>(
       launcher_view_->view_model_->view_at(index));
 }
 
 int LauncherViewTestAPI::GetLastVisibleIndex() {
   return launcher_view_->last_visible_index_;
 }
 
@@ skipping 22 matching lines @@
 
   // This nested loop will quit when TestAPIAnimationObserver's
   // OnBoundsAnimatorDone is called.
   MessageLoop::current()->Run();
 
   launcher_view_->bounds_animator_->RemoveObserver(observer.get());
 }
 
 }  // namespace test
 }  // namespace ash