ash: Rename LauncherModel to ShelfModel.

chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc

Index: chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index 96bb85189f65d701efbe4d31dcab63e51361b4fa..f5d906e26aeeaf03e7911871c6e2a7743576742b 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 
 #include "ash/launcher/launcher.h"
-#include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_types.h"
+#include "ash/shelf/shelf_model.h"
 #include "ash/test/ash_test_base.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -18,7 +18,7 @@
 
 class TestChromeLauncherController : public ChromeLauncherController {
  public:
-  TestChromeLauncherController(Profile* profile, ash::LauncherModel* model)
+  TestChromeLauncherController(Profile* profile, ash::ShelfModel* model)
       : ChromeLauncherController(profile, model) {}
   virtual bool IsLoggedInAsGuest() OVERRIDE {
     return false;
@@ -40,7 +40,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
   virtual void SetUp() OVERRIDE {
     ash::test::AshTestBase::SetUp();
     controller_.reset(
-        new TestChromeLauncherController(profile(), &launcher_model_));
+        new TestChromeLauncherController(profile(), &shelf_model_));
   }
 
   virtual void TearDown() OVERRIDE {
@@ -60,7 +60,7 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
 
  private:
   scoped_ptr<TestingProfile> profile_;
-  ash::LauncherModel launcher_model_;
+  ash::ShelfModel shelf_model_;
   scoped_ptr<ChromeLauncherController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(LauncherContextMenuTest);