Promotes a handful of members from WmShell to Shell

chrome/browser/chromeos/arc/wallpaper/arc_wallpaper_service.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/chromeos/arc/wallpaper/arc_wallpaper_service.h"
 
 #include "ash/common/wallpaper/wallpaper_controller.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/task_scheduler/post_task.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "components/wallpaper/wallpaper_files_id.h"
 #include "components/wallpaper/wallpaper_layout.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 41 matching lines @@
   // wallpaper_private_api.cc.
 }
 
 std::vector<uint8_t> EncodeImagePng(const gfx::ImageSkia image) {
   std::vector<uint8_t> result;
   gfx::PNGCodec::FastEncodeBGRASkBitmap(*image.bitmap(), true, &result);
   return result;
 }
 
 ash::WallpaperController* GetWallpaperController() {
-  ash::WmShell* wm_shell = ash::WmShell::Get();
-  if (!wm_shell)
+  if (!ash::Shell::HasInstance())
     return nullptr;
-  return wm_shell->wallpaper_controller();
+  return ash::Shell::GetInstance()->wallpaper_controller();
 }
 
 }  // namespace
 
 ArcWallpaperService::ArcWallpaperService(ArcBridgeService* bridge_service)
     : ArcService(bridge_service), binding_(this) {
   arc_bridge_service()->wallpaper()->AddObserver(this);
 }
 
 ArcWallpaperService::~ArcWallpaperService() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // Make sure the callback is never called after destruction. It is safe to
   // call Cancel() even when there is no in-flight request.
   ImageDecoder::Cancel(this);
   ash::WallpaperController* wc = GetWallpaperController();
   if (wc)
     wc->RemoveObserver(this);
   arc_bridge_service()->wallpaper()->RemoveObserver(this);
 }
 
 void ArcWallpaperService::OnInstanceReady() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   mojom::WallpaperInstance* wallpaper_instance =
       ARC_GET_INSTANCE_FOR_METHOD(arc_bridge_service()->wallpaper(), Init);
   DCHECK(wallpaper_instance);
   wallpaper_instance->Init(binding_.CreateInterfacePtrAndBind());
-  ash::WmShell::Get()->wallpaper_controller()->AddObserver(this);
+  ash::Shell::GetInstance()->wallpaper_controller()->AddObserver(this);
 }
 
 void ArcWallpaperService::OnInstanceClosed() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ash::WallpaperController* wc = GetWallpaperController();
   if (wc)
     wc->RemoveObserver(this);
 }
 
 void ArcWallpaperService::SetWallpaper(const std::vector<uint8_t>& data) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ImageDecoder::Cancel(this);
   ImageDecoder::StartWithOptions(this, data, ImageDecoder::DEFAULT_CODEC, true,
                                  gfx::Size());
 }
 
 void ArcWallpaperService::GetWallpaper(const GetWallpaperCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  ash::WallpaperController* wc = ash::WmShell::Get()->wallpaper_controller();
+  ash::WallpaperController* wc =
+      ash::Shell::GetInstance()->wallpaper_controller();
   gfx::ImageSkia wallpaper = wc->GetWallpaper();
   base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE, base::TaskTraits().MayBlock().WithPriority(
                      base::TaskPriority::BACKGROUND),
       base::Bind(&EncodeImagePng, wallpaper), callback);
 }
 
 void ArcWallpaperService::OnImageDecoded(const SkBitmap& bitmap) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   SetBitmapAsWallpaper(bitmap);
 }
 
 void ArcWallpaperService::OnDecodeImageFailed() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   LOG(ERROR) << "Failed to decode wallpaper image.";
 }
 
 void ArcWallpaperService::OnWallpaperDataChanged() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   auto* wallpaper_instance = ARC_GET_INSTANCE_FOR_METHOD(
       arc_bridge_service()->wallpaper(), OnWallpaperChanged);
   if (!wallpaper_instance)
     return;
   wallpaper_instance->OnWallpaperChanged();
 }
 
 }  // namespace arc