ash: Rename LauncherModel to ShelfModel.

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 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 "ash/shelf/shelf_widget.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
-#include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
+#include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 ShelfWidget* GetShelfWidget() {
   return Launcher::ForPrimaryDisplay()->shelf_widget();
 }
 
 internal::ShelfLayoutManager* GetShelfLayoutManager() {
   return GetShelfWidget()->shelf_layout_manager();
 }
 
 } // namespace
 
 typedef test::AshTestBase ShelfWidgetTest;
 
-// Launcher can't be activated on mouse click, but it is activable from
+// Shelf can't be activated on mouse click, but it is activable from
 // the focus cycler or as fallback.
 // TODO(mtomasz): make this test work with the FocusController.
 // crbug.com/285364.
 TEST_F(ShelfWidgetTest, DISABLED_ActivateAsFallback) {
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   ShelfWidget* shelf_widget = launcher->shelf_widget();
   EXPECT_FALSE(shelf_widget->CanActivate());
 
   shelf_widget->WillActivateAsFallback();
   EXPECT_TRUE(shelf_widget->CanActivate());
@@ skipping 133 matching lines @@
   const int status_width =
       shelf->status_area_widget()->GetWindowBoundsInScreen().width();
   EXPECT_GT(status_width, 0);
   EXPECT_EQ(status_width,
             shelf->GetContentsView()->width() -
                 test::LauncherTestAPI(launcher).shelf_view()->width());
 }
 #endif
 
 }  // namespace ash