Promotes a handful of members from WmShell to Shell

ash/common/system/chromeos/palette/tools/create_note_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/system/chromeos/palette/mock_palette_tool_delegate.h"
 #include "ash/common/system/chromeos/palette/palette_ids.h"
 #include "ash/common/system/chromeos/palette/palette_tool.h"
 #include "ash/common/system/chromeos/palette/tools/create_note_action.h"
 #include "ash/common/test/test_palette_delegate.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/shell_test_api.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 namespace {
 
 // Base class for all create note ash tests.
 class CreateNoteTest : public test::AshTestBase {
  public:
   CreateNoteTest() {}
   ~CreateNoteTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
 
-    WmShell::Get()->SetPaletteDelegateForTesting(
+    test::ShellTestApi().SetPaletteDelegate(
         base::MakeUnique<TestPaletteDelegate>());
 
     palette_tool_delegate_ = base::MakeUnique<MockPaletteToolDelegate>();
     tool_ = base::MakeUnique<CreateNoteAction>(palette_tool_delegate_.get());
   }
 
   TestPaletteDelegate* test_palette_delegate() {
     return static_cast<TestPaletteDelegate*>(
-        WmShell::Get()->palette_delegate());
+        Shell::GetInstance()->palette_delegate());
   }
 
  protected:
   std::unique_ptr<MockPaletteToolDelegate> palette_tool_delegate_;
   std::unique_ptr<PaletteTool> tool_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CreateNoteTest);
 };
 
@@ skipping 19 matching lines @@
 
   EXPECT_CALL(*palette_tool_delegate_.get(),
               DisableTool(PaletteToolId::CREATE_NOTE));
   EXPECT_CALL(*palette_tool_delegate_.get(), HidePalette());
 
   tool_->OnEnable();
   EXPECT_EQ(1, test_palette_delegate()->create_note_count());
 }
 
 }  // namespace ash