mash: Reverse the responsibilities of the NewWindowClient.

chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "ash/common/system/tray/system_tray.h"
-#include "ash/common/test/wm_shell_test_api.h"
 #include "ash/common/wm_shell.h"
-#include "ash/public/interfaces/new_window.mojom.h"
 #include "ash/shell.h"
 #include "ash/sticky_keys/sticky_keys_controller.h"
 #include "ash/sticky_keys/sticky_keys_overlay.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/prefs/pref_service.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace chromeos {
 
-class CountingNewWindowClient : public ash::mojom::NewWindowClient {
- public:
-  CountingNewWindowClient() {}
-  ~CountingNewWindowClient() override {}
-
-  int new_tab_action_count() const { return new_tab_action_count_; }
-
-  // ash::mojom::NewWindowClient:
-  void NewTab() override { new_tab_action_count_++; }
-  void NewWindow(bool incognito) override {}
-  void OpenFileManager() override {}
-  void OpenCrosh() override {}
-  void OpenGetHelp() override {}
-  void RestoreTab() override {}
-  void ShowKeyboardOverlay() override {}
-  void ShowTaskManager() override {}
-  void OpenFeedbackPage() override {}
-
- private:
-  int new_tab_action_count_ = 0;
-
-  DISALLOW_COPY_AND_ASSIGN(CountingNewWindowClient);
-};
-
 class StickyKeysBrowserTest : public InProcessBrowserTest {
  public:
   void SetUpOnMainThread() override {
     content::BrowserTestBase::SetUpOnMainThread();
     event_generator_.reset(
         new ui::test::EventGenerator(browser()->window()->GetNativeWindow()));
-
-    new_window_client_ = new CountingNewWindowClient;
-    ash::WmShellTestApi().SetNewWindowClient(
-        base::WrapUnique(new_window_client_));
   }
 
  protected:
   StickyKeysBrowserTest() {}
   ~StickyKeysBrowserTest() override {}
 
   void EnableStickyKeys() {
     AccessibilityManager::Get()->EnableStickyKeys(true);
   }
 
   void DisableStickyKeys() {
     AccessibilityManager::Get()->EnableStickyKeys(false);
   }
 
   ash::SystemTray* GetSystemTray() {
     return ash::Shell::GetInstance()->GetPrimarySystemTray();
   }
 
   void SendKeyPress(ui::KeyboardCode key) {
     event_generator_->PressKey(key, ui::EF_NONE);
+    content::RunAllPendingInMessageLoop();
     event_generator_->ReleaseKey(key, ui::EF_NONE);
+    content::RunAllPendingInMessageLoop();
   }
 
   content::NotificationRegistrar registrar_;
   std::unique_ptr<ui::test::EventGenerator> event_generator_;
-  CountingNewWindowClient* new_window_client_;
 
   DISALLOW_COPY_AND_ASSIGN(StickyKeysBrowserTest);
 };
 
 IN_PROC_BROWSER_TEST_F(StickyKeysBrowserTest, OpenTrayMenu) {
   EnableStickyKeys();
 
   // Open system tray bubble with shortcut.
   SendKeyPress(ui::VKEY_MENU); // alt key.
   SendKeyPress(ui::VKEY_SHIFT);
@@ skipping 16 matching lines @@
   EXPECT_FALSE(GetSystemTray()->HasSystemBubble());
 }
 
 IN_PROC_BROWSER_TEST_F(StickyKeysBrowserTest, OpenNewTabs) {
   // Lock the modifier key.
   EnableStickyKeys();
   SendKeyPress(ui::VKEY_CONTROL);
   SendKeyPress(ui::VKEY_CONTROL);
 
   // In the locked state, pressing 't' should open a new tab each time.
-  int tab_count = 0;
-  for (; tab_count < 4; ++tab_count) {
-    EXPECT_EQ(tab_count, new_window_client_->new_tab_action_count());
+  TabStripModel* tab_strip_model = browser()->tab_strip_model();
+  int tab_count = 1;
+  for (; tab_count < 5; ++tab_count) {
+    EXPECT_EQ(tab_count, tab_strip_model->count());
     SendKeyPress(ui::VKEY_T);
   }
 
   // Unlock the modifier key and shortcut should no longer activate.
   SendKeyPress(ui::VKEY_CONTROL);
   SendKeyPress(ui::VKEY_T);
-  EXPECT_EQ(tab_count, new_window_client_->new_tab_action_count());
+  EXPECT_EQ(tab_count, tab_strip_model->count());
 
   // Shortcut should not work after disabling sticky keys.
   DisableStickyKeys();
   SendKeyPress(ui::VKEY_CONTROL);
   SendKeyPress(ui::VKEY_CONTROL);
   SendKeyPress(ui::VKEY_T);
-  EXPECT_EQ(tab_count, new_window_client_->new_tab_action_count());
+  EXPECT_EQ(tab_count, tab_strip_model->count());
 }
 
 IN_PROC_BROWSER_TEST_F(StickyKeysBrowserTest, CtrlClickHomeButton) {
   // Show home page button.
   browser()->profile()->GetPrefs()->SetBoolean(prefs::kShowHomeButton, true);
   TabStripModel* tab_strip_model = browser()->tab_strip_model();
   int tab_count = 1;
   EXPECT_EQ(tab_count, tab_strip_model->count());
 
   // Test sticky keys with modified mouse click action.
@@ skipping 95 matching lines @@
   EXPECT_TRUE(sticky_keys_overlay->is_visible());
   DisableStickyKeys();
   EXPECT_FALSE(controller->GetOverlayForTest());
   for (auto key_code : modifier_keys) {
     SendKeyPress(key_code);
     EXPECT_FALSE(controller->GetOverlayForTest());
   }
 }
 
 }  // namespace chromeos