mash: Move ownership of ShelfDelegate to WmShell

chrome/browser/chromeos/arc/arc_auth_service.cc

Index: chrome/browser/chromeos/arc/arc_auth_service.cc
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc
index c20b7401e98994688138b9c3ba3d02006c883521..cfa50389901379639eebca1e044678c1bba7da0e 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_service.cc
@@ -6,8 +6,8 @@
 
 #include <utility>
 
-#include "ash/shelf/shelf_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/shelf/shelf_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -82,8 +82,10 @@ bool IsArcDisabledForEnterprise() {
 ash::ShelfDelegate* GetShelfDelegate() {
   if (g_shelf_delegate_for_testing)
     return g_shelf_delegate_for_testing;
-  if (ash::Shell::HasInstance())
-    return ash::Shell::GetInstance()->GetShelfDelegate();
+  if (ash::WmShell::HasInstance()) {
+    DCHECK(ash::WmShell::Get()->shelf_delegate());
+    return ash::WmShell::Get()->shelf_delegate();
+  }
   return nullptr;
 }