Consolidate Browser Creation.

chrome/browser/ui/views/ash/window_positioner_unittest.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 "chrome/browser/ui/views/ash/window_positioner.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
@@ skipping 15 matching lines @@
 
 namespace ash {
 namespace test {
 
 namespace {
 
 // A browser window proxy which is able to associate an aura native window with
 // it.
 class TestBrowserWindowAura : public TestBrowserWindow {
  public:
-  TestBrowserWindowAura(Browser* browser, aura::Window *native_window);
+  explicit TestBrowserWindowAura(aura::Window *native_window);
   virtual ~TestBrowserWindowAura();
 
   virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
     return native_window_;
   }
 
  private:
   gfx::NativeWindow native_window_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura);
 };
 
-TestBrowserWindowAura::TestBrowserWindowAura(Browser* browser,
-                                             aura::Window *native_window) :
-    TestBrowserWindow(browser),
-    native_window_(native_window) {
+TestBrowserWindowAura::TestBrowserWindowAura(aura::Window *native_window)
+    : native_window_(native_window) {
 }
 
 TestBrowserWindowAura::~TestBrowserWindowAura() {}
 
 // A test class for preparing window positioner tests - it creates a testing
 // base by adding a window, a popup and a panel which can be independently
 // positioned to see where the positioner will place the window.
 class WindowPositionerTest : public AshTestBase {
  public:
   WindowPositionerTest();
@@ skipping 62 matching lines @@
       ash::Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_DefaultContainer);
   window_.reset(aura::test::CreateTestWindowWithId(0, default_container));
   window_->SetBounds(gfx::Rect(16, 32, 640, 320));
   popup_.reset(aura::test::CreateTestWindowWithId(1, default_container));
   popup_->SetBounds(gfx::Rect(16, 32, 128, 256));
   panel_.reset(aura::test::CreateTestWindowWithId(2, default_container));
   panel_->SetBounds(gfx::Rect(32, 48, 256, 512));
 
   // Create a browser for the window.
-  window_owning_browser_.reset(new Browser(Browser::TYPE_TABBED,
-                                           profile_.get()));
-  browser_window_.reset(new TestBrowserWindowAura(
-                            window_owning_browser_.get(),
-                            window_.get()));
-  window_owning_browser_->SetWindowForTesting(browser_window_.get());
+  browser_window_.reset(new TestBrowserWindowAura(window_.get()));
+  Browser::CreateParams window_params(profile_.get());
+  window_params.window = browser_window_.get();
+  window_owning_browser_.reset(new Browser(window_params));
 
   // Creating a browser for the popup.
-  popup_owning_browser_.reset(new Browser(Browser::TYPE_POPUP,
-                                          profile_.get()));
-  browser_popup_.reset(new TestBrowserWindowAura(
-                           popup_owning_browser_.get(),
-                           popup_.get()));
-  popup_owning_browser_->SetWindowForTesting(browser_popup_.get());
+  browser_popup_.reset(new TestBrowserWindowAura(popup_.get()));
+  Browser::CreateParams popup_params(Browser::TYPE_POPUP, profile_.get());
+  popup_params.window = browser_popup_.get();
+  popup_owning_browser_.reset(new Browser(popup_params));
 
   // Creating a browser for the panel.
-  panel_owning_browser_.reset(new Browser(Browser::TYPE_PANEL,
-                                          profile_.get()));
-  browser_panel_.reset(new TestBrowserWindowAura(
-                          panel_owning_browser_.get(),
-                          panel_.get()));
-  panel_owning_browser_->SetWindowForTesting(browser_panel_.get());
+  browser_panel_.reset(new TestBrowserWindowAura(panel_.get()));
+  Browser::CreateParams panel_params(Browser::TYPE_PANEL, profile_.get());
+  panel_params.window = browser_panel_.get();
+  panel_owning_browser_.reset(new Browser(panel_params));
   // We hide all windows upon start - each user is required to set it up
   // as he needs it.
   window()->Hide();
   popup()->Hide();
   panel()->Hide();
   window_positioner_ = new WindowPositioner();
 
   // Get the alignment size.
   grid_size_ = ash::Shell::GetInstance()->GetGridSize();
   if (!grid_size_) {
@@ skipping 163 matching lines @@
 
   // Check that the popup is placed full screen.
   gfx::Rect full = window_positioner()->GetPopupPosition(pop_position);
   EXPECT_EQ(gfx::Rect(work_area.x(), work_area.y(),
                       pop_position.width(), pop_position.height()),
                       full);
 }
 
 }  // namespace test
 }  // namespace ash