mash: Prerequisites for removing ShelfDelegate.

ash/test/test_shelf_delegate.h

Index: ash/test/test_shelf_delegate.h
diff --git a/ash/test/test_shelf_delegate.h b/ash/test/test_shelf_delegate.h
index 5b5673b718c634331b53e7fb6071a45e5ee68ccf..ddf15495800fc44fa865dc1ea1446a501fd8042c 100644
--- a/ash/test/test_shelf_delegate.h
+++ b/ash/test/test_shelf_delegate.h
@@ -5,48 +5,22 @@
 #ifndef ASH_TEST_TEST_SHELF_DELEGATE_H_
 #define ASH_TEST_TEST_SHELF_DELEGATE_H_
 
-#include <memory>
-#include <set>
 #include <string>
 
 #include "ash/shelf/shelf_delegate.h"
 #include "base/macros.h"
-#include "ui/aura/window_observer.h"
 
 namespace ash {
-
-class WmWindow;
-
 namespace test {
 
-class ShelfInitializer;
-
 // Test implementation of ShelfDelegate.
-// Tests may create icons for windows by calling AddShelfItem().
-class TestShelfDelegate : public ShelfDelegate, public aura::WindowObserver {
+class TestShelfDelegate : public ShelfDelegate {
  public:
   TestShelfDelegate();
   ~TestShelfDelegate() override;
 
-  // Adds a ShelfItem for the given |window|. The ShelfItem's status will be
-  // STATUS_CLOSED.
-  void AddShelfItem(WmWindow* window);
-
-  // Adds a ShelfItem for the given |window| and |app_id|. The ShelfItem's
-  // status will be STATUS_CLOSED.
-  void AddShelfItem(WmWindow* window, const std::string& app_id);
-
-  // Removes the ShelfItem for the specified |window| and unpins it if it was
-  // pinned. The |window|'s ShelfID to app id mapping will be removed if it
-  // exists.
-  void RemoveShelfItemForWindow(WmWindow* window);
-
   static TestShelfDelegate* instance() { return instance_; }
 
-  // WindowObserver implementation
-  void OnWindowDestroying(aura::Window* window) override;
-  void OnWindowHierarchyChanging(const HierarchyChangeParams& params) override;
-
   // ShelfDelegate implementation.
   ShelfID GetShelfIDForAppID(const std::string& app_id) override;
   ShelfID GetShelfIDForAppIDAndLaunchID(const std::string& app_id,
@@ -59,10 +33,6 @@ class TestShelfDelegate : public ShelfDelegate, public aura::WindowObserver {
  private:
   static TestShelfDelegate* instance_;
 
-  std::unique_ptr<ShelfInitializer> shelf_initializer_;
-
-  std::set<std::string> pinned_apps_;
-
   DISALLOW_COPY_AND_ASSIGN(TestShelfDelegate);
 };