Consolidate Browser Creation.

chrome/test/base/browser_with_test_window_test.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/test/base/browser_with_test_window_test.h"
 
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 23 matching lines @@
       file_thread_(BrowserThread::FILE, message_loop()),
       file_user_blocking_thread_(
           BrowserThread::FILE_USER_BLOCKING, message_loop()) {
   db_thread_.Start();
 }
 
 void BrowserWithTestWindowTest::SetUp() {
   testing::Test::SetUp();
 
   set_profile(CreateProfile());
-  browser_.reset(new Browser(Browser::TYPE_TABBED, profile()));
-  window_.reset(new TestBrowserWindow(browser()));
-  browser_->SetWindowForTesting(window_.get());
+  window_.reset(new TestBrowserWindow);
+  Browser::CreateParams params(profile());
+  params.window = window_.get();
+  browser_.reset(new Browser(params));
 #if defined(USE_AURA)
   aura_test_helper_.reset(new aura::test::AuraTestHelper(&ui_loop_));
   aura_test_helper_->SetUp();
 #endif  // USE_AURA
 }
 
 void BrowserWithTestWindowTest::TearDown() {
   testing::Test::TearDown();
 #if defined(USE_AURA)
   aura_test_helper_->TearDown();
@@ skipping 96 matching lines @@
   // Destroy the profile here - otherwise, if the profile is freed in the
   // destructor, and a test subclass owns a resource that the profile depends
   // on (such as g_browser_process()->local_state()) there's no way for the
   // subclass to free it after the profile.
   profile_.reset(NULL);
 }
 
 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
   return new TestingProfile();
 }