Promotes a handful of members from WmShell to Shell

ash/system/toast/toast_manager_unittest.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_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/system/toast/toast_manager.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
@@ skipping 16 matching lines @@
 
 class ToastManagerTest : public test::AshTestBase {
  public:
   ToastManagerTest() {}
   ~ToastManagerTest() override {}
 
  private:
   void SetUp() override {
     test::AshTestBase::SetUp();
 
-    manager_ = WmShell::Get()->toast_manager();
+    manager_ = Shell::GetInstance()->toast_manager();
 
     manager_->ResetSerialForTesting();
     EXPECT_EQ(0, GetToastSerial());
   }
 
  protected:
   ToastManager* manager() { return manager_; }
 
   int GetToastSerial() { return manager_->serial_for_testing(); }
 
@@ skipping 256 matching lines @@
   EXPECT_EQ(base::ASCIIToUTF16("TEXT3"), GetCurrentText());
   // Cancel the shown toast.
   CancelToast(id3);
   // Confirm that the shown toast disappears.
   EXPECT_FALSE(GetCurrentOverlay());
   // Confirm that only 1 toast is shown.
   EXPECT_EQ(2, GetToastSerial());
 }
 
 }  // namespace ash