ash: Rename LauncherModel to ShelfModel.

ash/shell_unittest.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/shell.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 377 matching lines @@
         views::MenuItemView::TOPLEFT, ui::MENU_SOURCE_MOUSE,
         views::MenuRunner::CONTEXT_MENU));
 }
 
 TEST_F(ShellTest, ManagedWindowModeBasics) {
   Shell* shell = Shell::GetInstance();
   Shell::TestApi test_api(shell);
 
   // We start with the usual window containers.
   ExpectAllContainers();
-  // Launcher is visible.
+  // Shelf is visible.
   ShelfWidget* launcher_widget = Launcher::ForPrimaryDisplay()->shelf_widget();
   EXPECT_TRUE(launcher_widget->IsVisible());
-  // Launcher is at bottom-left of screen.
+  // Shelf is at bottom-left of screen.
   EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x());
   EXPECT_EQ(
       Shell::GetPrimaryRootWindow()->GetDispatcher()->GetHostSize().height(),
       launcher_widget->GetWindowBoundsInScreen().bottom());
   // We have a desktop background but not a bare layer.
   // TODO (antrim): enable once we find out why it fails component build.
   //  internal::DesktopBackgroundWidgetController* background =
   //      Shell::GetPrimaryRootWindow()->
   //          GetProperty(internal::kWindowDesktopComponent);
   //  EXPECT_TRUE(background);
@@ skipping 119 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash