Consolidate Browser Creation.

chrome/browser/ui/tab_contents/tab_contents_iterator_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/tab_contents/tab_contents_iterator.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #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"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_renderer_host.h"
 
 typedef BrowserWithTestWindowTest BrowserListTest;
 
 namespace {
 
@@ skipping 14 matching lines @@
 
 }  // namespace
 
 TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) {
   // Make sure we have 1 window to start with.
   EXPECT_EQ(1U, BrowserList::size());
 
   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<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());
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser3(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser4(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
 
   // Sanity checks.
   EXPECT_EQ(4U, BrowserList::size());
   EXPECT_EQ(0, browser()->tab_count());
   EXPECT_EQ(0, browser2->tab_count());
   EXPECT_EQ(0, browser3->tab_count());
   EXPECT_EQ(0, browser4->tab_count());
 
   EXPECT_EQ(0U, CountAllTabs());
 
@@ skipping 16 matching lines @@
   EXPECT_EQ(42U, CountAllTabs());
   // Close all remaining tabs to keep all the destructors happy.
   chrome::CloseAllTabs(browser3.get());
 }
 
 TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) {
   // Make sure we have 1 window to start with.
   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<TestBrowserWindow> window2(new TestBrowserWindow(browser2.get()));
-  scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
-
-  browser2->SetWindowForTesting(window2.get());
-  browser3->SetWindowForTesting(window3.get());
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser3(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
 
   // Sanity checks.
   EXPECT_EQ(3U, BrowserList::size());
   EXPECT_EQ(0, browser()->tab_count());
   EXPECT_EQ(0, browser2->tab_count());
   EXPECT_EQ(0, browser3->tab_count());
 
   EXPECT_EQ(0U, CountAllTabs());
 
   // Add some tabs.
@@ skipping 43 matching lines @@
   chrome::CloseAllTabs(browser3.get());
 }
 
 #if 0
 // TODO(thestig) Fix or remove this test. http://crbug.com/100309
 TEST_F(BrowserListTest, TabContentsIteratorBackgroundPrinting) {
   // Make sure we have 1 window to start with.
   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<TestBrowserWindow> window2(new TestBrowserWindow(browser2.get()));
-  scoped_ptr<TestBrowserWindow> window3(new TestBrowserWindow(browser3.get()));
-
-  browser2->SetWindowForTesting(window2.get());
-  browser3->SetWindowForTesting(window3.get());
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
+  scoped_ptr<Browser> browser3(
+      chrome::CreateBrowserWithTestWindowForProfile(profile()));
 
   EXPECT_EQ(0U, CountAllTabs());
 
   // Add some tabs.
   for (size_t i = 0; i < 3; ++i)
     chrome::NewTab(browser2);
   chrome::NewTab(browser3);
 
   EXPECT_EQ(4U, CountAllTabs());
 
@@ skipping 78 matching lines @@
   testing_browser_process->SetProfileManager(profile_manager);
 
   browser::AttemptRestart();
   // Cancel the effects of us calling browser::AttemptRestart. Otherwise tests
   // ran after this one will fail.
   browser_shutdown::SetTryingToQuit(false);
 
   EXPECT_TRUE(testing_pref_service.GetBoolean(prefs::kWasRestarted));
   testing_browser_process->SetLocalState(NULL);
 }