Make WindowTree::SetModal() take the type.

ui/aura/test/mus/test_window_tree.cc

 // Copyright 2015 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 "ui/aura/test/mus/test_window_tree.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace aura {
 
@@ skipping 189 matching lines @@
 }
 
 void TestWindowTree::RemoveTransientWindowFromParent(
     uint32_t change_id,
     uint32_t transient_window_id) {
   transient_data_.parent_id = kInvalidServerId;
   transient_data_.child_id = transient_window_id;
   OnChangeReceived(change_id, WindowTreeChangeType::REMOVE_TRANSIENT);
 }
 
-void TestWindowTree::SetModal(uint32_t change_id, uint32_t window_id) {
+void TestWindowTree::SetModalType(uint32_t change_id,
+                                  uint32_t window_id,
+                                  ui::ModalType modal_type) {
   OnChangeReceived(change_id, WindowTreeChangeType::MODAL);
 }
 
 void TestWindowTree::ReorderWindow(uint32_t change_id,
                                    uint32_t window_id,
                                    uint32_t relative_window_id,
                                    ui::mojom::OrderDirection direction) {
   OnChangeReceived(change_id, WindowTreeChangeType::REORDER);
 }
 
@@ skipping 75 matching lines @@
 void TestWindowTree::PerformWindowMove(uint32_t change_id,
                                        uint32_t window_id,
                                        ui::mojom::MoveLoopSource source,
                                        const gfx::Point& cursor_location) {
   OnChangeReceived(change_id);
 }
 
 void TestWindowTree::CancelWindowMove(uint32_t window_id) {}
 
 }  // namespace aura