chromeos: convert remaining AshTest usage to AshTestBase

ash/test/ash_test_base.h

 // Copyright (c) 2012 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 ASH_TEST_ASH_TEST_BASE_H_
 #define ASH_TEST_ASH_TEST_BASE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 31 matching lines @@
 class EventGenerator;
 }
 }
 
 namespace views {
 class Widget;
 class WidgetDelegate;
 }
 
 namespace ash {
-class AshTestImplAura;
 class SystemTray;
 class WmShelf;
 
 namespace test {
 
 class AshTestEnvironment;
 class AshTestHelper;
 class TestScreenshotDelegate;
 class TestSessionControllerClient;
 class TestSystemTrayDelegate;
@@ skipping 33 matching lines @@
   // |bounds_in_screen| is empty the window is added to the primary root
   // window, otherwise the window is added to the display matching
   // |bounds_in_screen|. |shell_window_id| is the shell window id to give to
   // the new window.
   // TODO(sky): convert existing CreateTestWindow() functions into this one.
   std::unique_ptr<aura::Window> CreateTestWindow(
       const gfx::Rect& bounds_in_screen = gfx::Rect(),
       ui::wm::WindowType type = ui::wm::WINDOW_TYPE_NORMAL,
       int shell_window_id = kShellWindowId_Invalid);
 
+  // Creates a visible top-level window. For Config::CLASSIC and Config::MUS
+  // this creates a Window with a delegate. For Config::MASH this creates a
+  // window as if the client requested a top-level window.
+  std::unique_ptr<aura::Window> CreateToplevelTestWindow(
+      const gfx::Rect& bounds_in_screen = gfx::Rect(),
+      int shell_window_id = kShellWindowId_Invalid);
+
   // Versions of the functions in aura::test:: that go through our shell
   // StackingController instead of taking a parent.
   aura::Window* CreateTestWindowInShellWithId(int id);
   aura::Window* CreateTestWindowInShellWithBounds(const gfx::Rect& bounds);
   aura::Window* CreateTestWindowInShell(SkColor color,
                                         int id,
                                         const gfx::Rect& bounds);
 
   // Creates a visible window parented to |parent| with the specified bounds and
   // id.
@@ skipping 70 matching lines @@
 
   void DisableIME();
 
   // Swap the primary display with the secondary.
   void SwapPrimaryDisplay();
 
   display::Display GetPrimaryDisplay();
   display::Display GetSecondaryDisplay();
 
  private:
-  friend class ash::AshTestImplAura;
-
   bool setup_called_;
   bool teardown_called_;
   // |SetUp()| doesn't activate session if this is set to false.
   bool start_session_;
   std::unique_ptr<AshTestEnvironment> ash_test_environment_;
   std::unique_ptr<AshTestHelper> ash_test_helper_;
   std::unique_ptr<ui::test::EventGenerator> event_generator_;
 
   DISALLOW_COPY_AND_ASSIGN(AshTestBase);
 };
 
 class NoSessionAshTestBase : public AshTestBase {
  public:
   NoSessionAshTestBase() { set_start_session(false); }
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_