Clean up ash::ShellTestApi

ash/shelf/shelf_window_watcher_unittest.cc

 // Copyright 2013 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/shelf/shelf_window_watcher.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/test/shell_test_api.h"
 #include "ash/wm/window_state_aura.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/hit_test.h"
 
 namespace ash {
 
 class ShelfWindowWatcherTest : public test::AshTestBase {
  public:
   ShelfWindowWatcherTest() : model_(NULL) {}
   ~ShelfWindowWatcherTest() override {}
 
   void SetUp() override {
     test::AshTestBase::SetUp();
-    model_ = test::ShellTestApi(Shell::GetInstance()).shelf_model();
+    model_ = WmShell::Get()->shelf_model();
   }
 
   void TearDown() override {
     model_ = NULL;
     test::AshTestBase::TearDown();
   }
 
   ShelfID CreateShelfItem(aura::Window* window) {
     ShelfID id = model_->next_id();
     ShelfItemDetails item_details;
@@ skipping 227 matching lines @@
     // container before fininshing the dragging.
     EXPECT_TRUE(wm::GetWindowState(window.get())->is_dragged());
     new_parent->AddChild(window.get());
     EXPECT_EQ(1, model_->item_count());
   }
   EXPECT_FALSE(wm::GetWindowState(window.get())->is_dragged());
   EXPECT_EQ(1, model_->item_count());
 }
 
 }  // namespace ash