Consolidate Browser Creation.

chrome/browser/profiles/profile_manager_unittest.cc

Index: chrome/browser/profiles/profile_manager_unittest.cc
===================================================================
--- chrome/browser/profiles/profile_manager_unittest.cc	(revision 148382)
+++ chrome/browser/profiles/profile_manager_unittest.cc	(working copy)
@@ -28,6 +28,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.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.h"
@@ -414,14 +415,16 @@
   ASSERT_EQ(0U, last_opened_profiles.size());
 
   // Create a browser for profile1.
-  scoped_ptr<Browser> browser1a(new Browser(Browser::TYPE_TABBED, profile1));
+  scoped_ptr<Browser> browser1a(
+      chrome::CreateBrowserWithTestWindowForProfile(profile1));
 
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(1U, last_opened_profiles.size());
   EXPECT_EQ(profile1, last_opened_profiles[0]);
 
   // And for profile2.
-  scoped_ptr<Browser> browser2(new Browser(Browser::TYPE_TABBED, profile2));
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile2));
 
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(2U, last_opened_profiles.size());
@@ -429,7 +432,8 @@
   EXPECT_EQ(profile2, last_opened_profiles[1]);
 
   // Adding more browsers doesn't change anything.
-  scoped_ptr<Browser> browser1b(new Browser(Browser::TYPE_TABBED, profile1));
+  scoped_ptr<Browser> browser1b(
+      chrome::CreateBrowserWithTestWindowForProfile(profile1));
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(2U, last_opened_profiles.size());
   EXPECT_EQ(profile1, last_opened_profiles[0]);
@@ -471,10 +475,12 @@
   ASSERT_TRUE(profile2);
 
   // Create a browser for profile1.
-  scoped_ptr<Browser> browser1(new Browser(Browser::TYPE_TABBED, profile1));
+  scoped_ptr<Browser> browser1(
+      chrome::CreateBrowserWithTestWindowForProfile(profile1));
 
   // And for profile2.
-  scoped_ptr<Browser> browser2(new Browser(Browser::TYPE_TABBED, profile2));
+  scoped_ptr<Browser> browser2(
+      chrome::CreateBrowserWithTestWindowForProfile(profile2));
 
   std::vector<Profile*> last_opened_profiles =
       profile_manager->GetLastOpenedProfiles();
@@ -524,21 +530,24 @@
   ASSERT_EQ(0U, last_opened_profiles.size());
 
   // Create a browser for profile1.
-  scoped_ptr<Browser> browser1(new Browser(Browser::TYPE_TABBED, profile1));
+  scoped_ptr<Browser> browser1(
+      chrome::CreateBrowserWithTestWindowForProfile(profile1));
 
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(1U, last_opened_profiles.size());
   EXPECT_EQ(profile1, last_opened_profiles[0]);
 
   // And for profile2.
-  scoped_ptr<Browser> browser2a(new Browser(Browser::TYPE_TABBED, profile2));
+  scoped_ptr<Browser> browser2a(
+      chrome::CreateBrowserWithTestWindowForProfile(profile2));
 
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(1U, last_opened_profiles.size());
   EXPECT_EQ(profile1, last_opened_profiles[0]);
 
   // Adding more browsers doesn't change anything.
-  scoped_ptr<Browser> browser2b(new Browser(Browser::TYPE_TABBED, profile1));
+  scoped_ptr<Browser> browser2b(
+      chrome::CreateBrowserWithTestWindowForProfile(profile1));
   last_opened_profiles = profile_manager->GetLastOpenedProfiles();
   ASSERT_EQ(1U, last_opened_profiles.size());
   EXPECT_EQ(profile1, last_opened_profiles[0]);