Reland: mus: Enable system modal windows

components/mus/ws/test_utils.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_TEST_UTILS_H_
 #define COMPONENTS_MUS_WS_TEST_UTILS_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 93 matching lines @@
 
 // -----------------------------------------------------------------------------
 
 class EventDispatcherTestApi {
  public:
   explicit EventDispatcherTestApi(EventDispatcher* ed) : ed_(ed) {}
   ~EventDispatcherTestApi() {}
 
   bool AreAnyPointersDown() const { return ed_->AreAnyPointersDown(); }
   bool is_mouse_button_down() const { return ed_->mouse_button_down_; }
-  bool IsObservingWindow(ServerWindow* window) {
-    return ed_->IsObservingWindow(window);
+  bool IsWindowPointerTarget(const ServerWindow* window) const;
+  int NumberPointerTargetsForWindow(ServerWindow* window);
+  ServerWindow* GetActiveSystemModalWindow() const {
+    return ed_->modal_window_controller_.GetActiveSystemModalWindow();
   }
-  int NumberPointerTargetsForWindow(ServerWindow* window);
 
  private:
   EventDispatcher* ed_;
 
   DISALLOW_COPY_AND_ASSIGN(EventDispatcherTestApi);
 };
 
 // -----------------------------------------------------------------------------
 
 class WindowManagerStateTestApi {
@@ skipping 281 matching lines @@
 
 // Creates a new visible window as a child of the single root of |tree|.
 // |client_id| set to the ClientWindowId of the new window.
 ServerWindow* NewWindowInTree(WindowTree* tree, ClientWindowId* client_id);
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_TEST_UTILS_H_