Rename Launcher to Shelf.

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

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index bf4ad29597140b1f330e25e3b8167420b99e23b9..d1afb57349a3d86387c734b0e6d14d14ed52c1a6 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -9,14 +9,14 @@
 #include "apps/ui/native_app_window.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
-#include "ash/launcher/launcher.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
 #include "ash/shelf/shelf_model.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/test/app_list_controller_test_api.h"
-#include "ash/test/launcher_test_api.h"
+#include "ash/test/shelf_test_api.h"
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/wm/window_state.h"
@@ -1536,7 +1536,7 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, DragAndDrop) {
   aura::test::EventGenerator generator(
       ash::Shell::GetPrimaryRootWindow(), gfx::Point());
   ash::test::ShelfViewTestAPI test(
-      ash::test::LauncherTestAPI(launcher_).shelf_view());
+      ash::test::ShelfTestAPI(launcher_).shelf_view());
   AppListService* service = AppListService::Get(chrome::GetActiveDesktop());
 
   // There should be two items in our launcher by this time.
@@ -1683,7 +1683,7 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTestWithMultiMonitor,
 
   aura::test::EventGenerator generator(secondary_root_window, gfx::Point());
   ash::test::ShelfViewTestAPI test(
-      ash::test::LauncherTestAPI(secondary_launcher).shelf_view());
+      ash::test::ShelfTestAPI(secondary_launcher).shelf_view());
   AppListService* service = AppListService::Get(chrome::GetActiveDesktop());
 
   // There should be two items in our launcher by this time.
@@ -1762,7 +1762,7 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, DragOffShelf) {
   aura::test::EventGenerator generator(
       ash::Shell::GetPrimaryRootWindow(), gfx::Point());
   ash::test::ShelfViewTestAPI test(
-      ash::test::LauncherTestAPI(launcher_).shelf_view());
+      ash::test::ShelfTestAPI(launcher_).shelf_view());
   test.SetAnimationDuration(1);  // Speed up animations for test.
   // Create a known application and check that we have 3 items in the launcher.
   CreateShortcut("app1");
@@ -1865,7 +1865,7 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, ClickItem) {
   aura::test::EventGenerator generator(
       ash::Shell::GetPrimaryRootWindow(), gfx::Point());
   ash::test::ShelfViewTestAPI test(
-      ash::test::LauncherTestAPI(launcher_).shelf_view());
+      ash::test::ShelfTestAPI(launcher_).shelf_view());
   AppListService* service = AppListService::Get(chrome::GetActiveDesktop());
   // There should be two items in our launcher by this time.
   EXPECT_EQ(2, model_->item_count());
@@ -1967,7 +1967,7 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, OverflowBubble) {
   EXPECT_FALSE(launcher_->IsShowingOverflowBubble());
 
   ash::test::ShelfViewTestAPI test(
-      ash::test::LauncherTestAPI(launcher_).shelf_view());
+      ash::test::ShelfTestAPI(launcher_).shelf_view());
 
   int items_added = 0;
   while (!test.IsOverflowButtonVisible()) {