Make WindowTree::SetModal() take the type.

ui/aura/mus/window_tree_client_unittest.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/mus/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 1728 matching lines @@
   EXPECT_EQ(top_level->id(), capture_recorder2->last_lost_capture_window_id());
 
   capture_recorder1->reset_capture_captured_count();
   capture_recorder2->reset_capture_captured_count();
   capture_recorder1.reset();
   capture_recorder2.reset();
   window_tree_host.reset();
   capture_client.reset();
 }
 
-TEST_F(WindowTreeClientClientTest, ModalFail) {
+TEST_F(WindowTreeClientClientTest, ModalTypeWindowFail) {
   Window window(nullptr);
   window.Init(ui::LAYER_NOT_DRAWN);
   window.SetProperty(client::kModalKey, ui::MODAL_TYPE_WINDOW);
   // Make sure server was told about it, and have the server say it failed.
   ASSERT_TRUE(
       window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, false));
   // Type should be back to MODAL_TYPE_NONE as the server didn't accept the
   // change.
   EXPECT_EQ(ui::MODAL_TYPE_NONE, window.GetProperty(client::kModalKey));
+  // Server is told that the type is set back to MODAL_TYPE_NONE.
+  EXPECT_TRUE(
+      window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, true));
+  // Type should still remain MODAL_TYPE_NONE.
+  EXPECT_EQ(ui::MODAL_TYPE_NONE, window.GetProperty(client::kModalKey));
+}
+
+TEST_F(WindowTreeClientClientTest, ModalTypeNoneFail) {
+  Window window(nullptr);
+  window.Init(ui::LAYER_NOT_DRAWN);
+  // First, set modality type to window sucessfully.
+  window.SetProperty(client::kModalKey, ui::MODAL_TYPE_WINDOW);
+  ASSERT_TRUE(
+      window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, true));
+  EXPECT_EQ(ui::MODAL_TYPE_WINDOW, window.GetProperty(client::kModalKey));
+  // Now, set type to MODAL_TYPE_NONE, and have the server say it failed.
+  window.SetProperty(client::kModalKey, ui::MODAL_TYPE_NONE);
+  ASSERT_TRUE(
+      window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, false));
+  // Type should be back to MODAL_TYPE_WINDOW as the server didn't accept the
+  // change.
+  EXPECT_EQ(ui::MODAL_TYPE_WINDOW, window.GetProperty(client::kModalKey));
+  // Server is told that the type is set back to MODAL_TYPE_WINDOW.
+  EXPECT_TRUE(
+      window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, true));
+  // Type should still remain MODAL_TYPE_WINDOW.
+  EXPECT_EQ(ui::MODAL_TYPE_WINDOW, window.GetProperty(client::kModalKey));
+}
+
+TEST_F(WindowTreeClientClientTest, ModalTypeSuccess) {
+  Window window(nullptr);
+  window.Init(ui::LAYER_NOT_DRAWN);
+
+  // Set modality type to MODAL_TYPE_WINDOW, MODAL_TYPE_SYSTEM, and then back to
+  // MODAL_TYPE_NONE, and make sure it succeeds each time.
+  ui::ModalType kModalTypes[] = {ui::MODAL_TYPE_WINDOW, ui::MODAL_TYPE_SYSTEM,
+                                 ui::MODAL_TYPE_NONE};
+  for (size_t i = 0; i < arraysize(kModalTypes); i++) {
+    window.SetProperty(client::kModalKey, kModalTypes[i]);
+    // Ack change as succeeding.
+    ASSERT_TRUE(window_tree()->AckSingleChangeOfType(
+        WindowTreeChangeType::MODAL, true));
+    EXPECT_EQ(kModalTypes[i], window.GetProperty(client::kModalKey));
+  }
+
   // There should be no more modal changes.
   EXPECT_FALSE(
       window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, false));
-}
-
-TEST_F(WindowTreeClientClientTest, ModalSuccess) {
-  Window window(nullptr);
-  window.Init(ui::LAYER_NOT_DRAWN);
-  window.SetProperty(client::kModalKey, ui::MODAL_TYPE_WINDOW);
-  // Ack change as succeeding.
-  ASSERT_TRUE(
-      window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, true));
-  EXPECT_EQ(ui::MODAL_TYPE_WINDOW, window.GetProperty(client::kModalKey));
-  // There should be no more modal changes.
-  EXPECT_FALSE(
-      window_tree()->AckSingleChangeOfType(WindowTreeChangeType::MODAL, false));
 }
 
 // Verifies OnWindowHierarchyChanged() deals correctly with identifying existing
 // windows.
 TEST_F(WindowTreeClientWmTest, OnWindowHierarchyChangedWithExistingWindow) {
   Window* window1 = new Window(nullptr);
   window1->Init(ui::LAYER_NOT_DRAWN);
   Window* window2 = new Window(nullptr);
   window2->Init(ui::LAYER_NOT_DRAWN);
   window_tree()->AckAllChanges();
@@ skipping 199 matching lines @@
             window_tree()->GetEventResult(event_id));
   EXPECT_TRUE(window_delegate1.got_move());
   EXPECT_FALSE(window_delegate2.got_move());
   gfx::Point transformed_event_location_in_dip(event_location_in_dip.x() + 20,
                                                event_location_in_dip.y() + 30);
   EXPECT_EQ(transformed_event_location_in_dip,
             window_delegate1.last_event_location());
 }
 
 }  // namespace aura