Revert of Use a standard message box for DesktopCastingWarningView.

chrome/browser/ui/ash/multi_user/user_switch_util_unittest.cc

 // Copyright 2014 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/common/system/chromeos/screen_security/screen_tray_item.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/test/ash_test_base.h"
-#include "base/run_loop.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/ui/ash/multi_user/user_switch_util.h"
-#include "chrome/browser/ui/simple_message_box.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 
 class TrySwitchingUserTest : public ash::test::AshTestBase {
  public:
   // The action type to perform / check for upon user switching.
   enum ActionType {
     NO_DIALOG,       // No dialog should be shown.
     ACCEPT_DIALOG,   // A dialog should be shown and we should accept it.
@@ skipping 40 matching lines @@
   // Simulates a screen share session stop.
   void StopShareSession() { share_item_->Stop(); }
 
   // The callback which gets called when the screen share gets stopped.
   void StopShareCallback() { stop_share_callback_hit_count_++; }
 
   // Issuing a switch user call which might or might not create a dialog.
   // The passed |action| type parameter defines the outcome (which will be
   // checked) and the action the user will choose.
   void SwitchUser(ActionType action) {
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&CloseMessageBox, action));
     TrySwitchingActiveUser(base::Bind(&TrySwitchingUserTest::SwitchCallback,
                                       base::Unretained(this)));
-    base::RunLoop().RunUntilIdle();
+    switch (action) {
+      case NO_DIALOG:
+        EXPECT_TRUE(!TestAndTerminateDesktopCastingWarningForTest(true));
+        return;
+      case ACCEPT_DIALOG:
+        EXPECT_TRUE(TestAndTerminateDesktopCastingWarningForTest(true));
+        return;
+      case DECLINE_DIALOG:
+        EXPECT_TRUE(TestAndTerminateDesktopCastingWarningForTest(false));
+        return;
+    }
   }
 
   // Called when the user will get actually switched.
   void SwitchCallback() { switch_callback_hit_count_++; }
 
   // Methods needed to test with overview mode.
   const WindowSelectorController* window_selector_controller() const {
     return WmShell::Get()->window_selector_controller();
   }
   WindowSelectorController* window_selector_controller() {
     return const_cast<WindowSelectorController*>(
         const_cast<const TrySwitchingUserTest*>(this)
             ->window_selector_controller());
   }
   void ToggleOverview() { window_selector_controller()->ToggleOverview(); }
   bool IsSelecting() const {
     return window_selector_controller()->IsSelecting();
   }
 
   // Various counter accessors.
   int stop_capture_callback_hit_count() const {
     return stop_capture_callback_hit_count_;
   }
   int stop_share_callback_hit_count() const {
     return stop_share_callback_hit_count_;
   }
   int switch_callback_hit_count() const { return switch_callback_hit_count_; }
 
  private:
-  static void CloseMessageBox(ActionType action) {
-    switch (action) {
-      case NO_DIALOG:
-        EXPECT_FALSE(chrome::CloseMessageBoxForTest(true));
-        return;
-      case ACCEPT_DIALOG:
-        EXPECT_TRUE(chrome::CloseMessageBoxForTest(true));
-        return;
-      case DECLINE_DIALOG:
-        EXPECT_TRUE(chrome::CloseMessageBoxForTest(false));
-        return;
-    }
-  }
-
   // The two items from the SystemTray for the screen capture / share
   // functionality.
   ScreenTrayItem* capture_item_;
   ScreenTrayItem* share_item_;
 
   // Various counters to query for.
   int stop_capture_callback_hit_count_;
   int stop_share_callback_hit_count_;
   int switch_callback_hit_count_;
 
@@ skipping 111 matching lines @@
   gfx::Rect bounds(0, 0, 100, 100);
   std::unique_ptr<aura::Window> w(CreateTestWindowInShellWithBounds(bounds));
   ToggleOverview();
   ASSERT_TRUE(IsSelecting());
   SwitchUser(TrySwitchingUserTest::NO_DIALOG);
   ASSERT_FALSE(IsSelecting());
   EXPECT_EQ(1, switch_callback_hit_count());
 }
 
 }  // namespace ash