Moves maintaining ShellObservers back to Shell

chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.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 "chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h"
 
 #include <string>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 246 matching lines @@
   if (arc::IsArcAllowedForProfile(owner->profile())) {
     observed_profile_ = owner->profile();
     StartObserving(observed_profile_);
   }
 }
 
 ArcAppWindowLauncherController::~ArcAppWindowLauncherController() {
   if (observed_profile_)
     StopObserving(observed_profile_);
   if (observing_shell_)
-    ash::WmShell::Get()->RemoveShellObserver(this);
+    ash::Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 // static
 std::string ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(
     const std::string& arc_app_id) {
   return arc_app_id == arc::kPlayStoreAppId ? ArcSupportHost::kHostAppId
                                             : arc_app_id;
 }
 
 // static
@@ skipping 113 matching lines @@
     aura::Window* window) {
   const int task_id = GetWindowTaskId(window);
   if (task_id <= 0)
     return;
 
   // We need to add the observer after exo started observing shell
   // because we want to update the orientation after exo send
   // the layout switch information.
   if (!observing_shell_) {
     observing_shell_ = true;
-    ash::WmShell::Get()->AddShellObserver(this);
+    ash::Shell::GetInstance()->AddShellObserver(this);
   }
 
   // Check if we have controller for this task.
   if (GetAppWindowForTask(task_id))
     return;
 
   window->SetProperty(aura::client::kAppType,
                       static_cast<int>(ash::AppType::ARC_APP));
 
   // Create controller if we have task info.
@@ skipping 306 matching lines @@
   const std::string arc_app_id = exo::ShellSurface::GetApplicationId(window);
   if (arc_app_id.empty())
     return -1;
 
   int task_id = -1;
   if (sscanf(arc_app_id.c_str(), "org.chromium.arc.%d", &task_id) != 1)
     return -1;
 
   return task_id;
 }