Consolidate Browser Creation.

chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

Index: chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc
===================================================================
--- chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc	(revision 148382)
+++ chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc	(working copy)
@@ -16,6 +16,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile_manager.h"
@@ -50,18 +51,13 @@
   EXPECT_EQ(0U, CountAllTabs());
 
   // Create more browsers/windows.
-  scoped_ptr<Browser> browser2(new Browser(Browser::TYPE_TABBED, profile()));
-  scoped_ptr<Browser> browser3(new Browser(Browser::TYPE_TABBED, profile()));
-  scoped_ptr<Browser> browser4(new Browser(Browser::TYPE_TABBED, profile()));
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser3(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser4(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
 
-  scoped_ptr<TestBrowserWindow> window2(new TestBrowserWindow(browser2.get()));
-  scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
-  scoped_ptr<TestBrowserWindow> window4(new TestBrowserWindow(browser4.get()));
-
-  browser2->SetWindowForTesting(window2.get());
-  browser3->SetWindowForTesting(window3.get());
-  browser4->SetWindowForTesting(window4.get());
-
   // Sanity checks.
   EXPECT_EQ(4U, BrowserList::size());
   EXPECT_EQ(0, browser()->tab_count());
@@ -97,15 +93,11 @@
   EXPECT_EQ(1U, BrowserList::size());
 
   // Create more browsers/windows.
-  scoped_ptr<Browser> browser2(new Browser(Browser::TYPE_TABBED, profile()));
-  scoped_ptr<Browser> browser3(new Browser(Browser::TYPE_TABBED, profile()));
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser3(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
 
-  scoped_ptr<TestBrowserWindow> window2(new TestBrowserWindow(browser2.get()));
-  scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
-
-  browser2->SetWindowForTesting(window2.get());
-  browser3->SetWindowForTesting(window3.get());
-
   // Sanity checks.
   EXPECT_EQ(3U, BrowserList::size());
   EXPECT_EQ(0, browser()->tab_count());
@@ -168,15 +160,11 @@
   EXPECT_EQ(1U, BrowserList::size());
 
   // Create more browsers/windows.
-  scoped_ptr<Browser> browser2(new Browser(Browser::TYPE_TABBED, profile()));
-  scoped_ptr<Browser> browser3(new Browser(Browser::TYPE_TABBED, profile()));
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser3(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
 
-  scoped_ptr<TestBrowserWindow> window2(new TestBrowserWindow(browser2.get()));
-  scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
-
-  browser2->SetWindowForTesting(window2.get());
-  browser3->SetWindowForTesting(window3.get());
-
   EXPECT_EQ(0U, CountAllTabs());
 
   // Add some tabs.