Add CreateTestWidget() to AshTestBase, collapse duplicates

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>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/display/display.h"
 #include "ui/wm/public/window_types.h"
 
 #if defined(OS_WIN)
 #include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
+namespace aura {
+class RootWindow;
+class Window;
+class WindowDelegate;
+}  // namespace aura
+
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 namespace test {
 class EventGenerator;
 }
 }
 
-namespace aura {
-class RootWindow;
-class Window;
-class WindowDelegate;
-}  // namespace aura
+namespace views {
+class Widget;
+class WidgetDelegate;
+}
 
 namespace ash {
 class DisplayManager;
 class SystemTray;
 class WmShelf;
 
 namespace test {
 
 class AshTestHelper;
 class TestScreenshotDelegate;
@@ skipping 16 matching lines @@
 
   // Update the display configuration as given in |display_specs|.
   // See ash::test::DisplayManagerTestApi::UpdateDisplay for more details.
   void UpdateDisplay(const std::string& display_specs);
 
   // Returns a root Window. Usually this is the active root Window, but that
   // method can return NULL sometimes, and in those cases, we fall back on the
   // primary root Window.
   aura::Window* CurrentContext();
 
+  // Creates and shows a widget. See ash/common/shell_window_ids.h for values
+  // for |container_id|.
+  static std::unique_ptr<views::Widget> CreateTestWidget(
+      views::WidgetDelegate* delegate,
+      int container_id,
+      const gfx::Rect& bounds);
+
   // 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);
   aura::Window* CreateTestWindowInShellWithDelegate(
       aura::WindowDelegate* delegate,
       int id,
@@ skipping 86 matching lines @@
   ~NoSessionAshTestBase() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NoSessionAshTestBase);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_ASH_TEST_BASE_H_