Add CreateTestWidget() to AshTestBase, collapse duplicates

ash/test/ash_test_base.cc

 // 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.
 
 #include "ash/test/ash_test_base.h"
 
 #include <string>
 #include <vector>
 
 #include "ash/common/ash_switches.h"
@@ skipping 205 matching lines @@
 }
 
 void AshTestBase::UpdateDisplay(const std::string& display_specs) {
   DisplayManagerTestApi().UpdateDisplay(display_specs);
 }
 
 aura::Window* AshTestBase::CurrentContext() {
   return ash_test_helper_->CurrentContext();
 }
 
+// static
+std::unique_ptr<views::Widget> AshTestBase::CreateTestWidget(
+    views::WidgetDelegate* delegate,
+    int container_id,
+    const gfx::Rect& bounds) {
+  std::unique_ptr<views::Widget> widget(new views::Widget);
+  views::Widget::InitParams params;
+  params.delegate = delegate;
+  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  params.bounds = bounds;
+  WmShell::Get()
+      ->GetPrimaryRootWindow()
+      ->GetRootWindowController()
+      ->ConfigureWidgetInitParamsForContainer(widget.get(), container_id,
+                                              &params);
+  widget->Init(params);
+  widget->Show();
+  return widget;
+}
+
 aura::Window* AshTestBase::CreateTestWindowInShellWithId(int id) {
   return CreateTestWindowInShellWithDelegate(NULL, id, gfx::Rect());
 }
 
 aura::Window* AshTestBase::CreateTestWindowInShellWithBounds(
     const gfx::Rect& bounds) {
   return CreateTestWindowInShellWithDelegate(NULL, 0, bounds);
 }
 
 aura::Window* AshTestBase::CreateTestWindowInShell(SkColor color,
@@ skipping 118 matching lines @@
 
 void AshTestBase::DisableIME() {
   Shell::GetInstance()->RemovePreTargetHandler(
       Shell::GetInstance()
           ->window_tree_host_manager()
           ->input_method_event_handler());
 }
 
 }  // namespace test
 }  // namespace ash