Move yet more from WmShell to Shell

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

 // Copyright 2016 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/common/shelf/shelf_delegate.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/arc/arc_auth_notification.h"
 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/arc_util.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 84 matching lines @@
   }
 
   return apps;
 }
 
 ChromeLauncherController* chrome_controller() {
   return ChromeLauncherController::instance();
 }
 
 ash::ShelfDelegate* shelf_delegate() {
-  return ash::WmShell::Get()->shelf_delegate();
+  return ash::Shell::Get()->shelf_delegate();
 }
 
 class AppAnimatedWaiter {
  public:
   explicit AppAnimatedWaiter(const std::string& app_id) : app_id_(app_id) {}
 
   void Wait() {
     const base::TimeDelta threshold =
         base::TimeDelta::FromMilliseconds(kAppAnimatedThresholdMs);
     ArcAppDeferredLauncherController* controller =
@@ skipping 424 matching lines @@
   app_host()->OnTaskDestroyed(2);
   EXPECT_EQ(controller2, GetAppItemController(shelf_id2));
   // Destroy task #2, this kills shelf group 2
   app_host()->OnTaskDestroyed(3);
   EXPECT_FALSE(GetAppItemController(shelf_id2));
 
   // Disable ARC, this removes app and as result kills shelf group 3.
   arc::SetArcPlayStoreEnabledForProfile(profile(), false);
   EXPECT_FALSE(GetAppItemController(shelf_id3));
 }