Consolidate Browser Creation.

chrome/browser/ui/cocoa/profile_menu_controller_unittest.mm

 // Copyright (c) 2011 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.
 
 #import "chrome/browser/ui/cocoa/profile_menu_controller.h"
 
 #include "base/memory/scoped_nsobject.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
+#include "chrome/test/base/test_browser_window.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 class ProfileMenuControllerTest : public CocoaProfileTest {
  public:
   ProfileMenuControllerTest() {
     item_.reset([[NSMenuItem alloc] initWithTitle:@"Users"
                                            action:nil
                                     keyEquivalent:@""]);
@@ skipping 110 matching lines @@
 // BrowserWindow::Show() and when a Browser becomes active. We don't need a full
 // BrowserWindow, so it is called manually.
 TEST_F(ProfileMenuControllerTest, SetActiveAndRemove) {
   NSMenu* menu = [controller() menu];
   TestingProfileManager* manager = testing_profile_manager();
   TestingProfile* profile2 = manager->CreateTestingProfile("Profile 2");
   TestingProfile* profile3 = manager->CreateTestingProfile("Profile 3");
   ASSERT_EQ(7, [menu numberOfItems]);
 
   // Create a browser and "show" it.
-  scoped_ptr<Browser> p2_browser(new Browser(Browser::TYPE_TABBED, profile2));
+  scoped_ptr<Browser> p2_browser(
+      chrome::CreateBrowserWithTestWindowForProfile(profile2));
   BrowserList::SetLastActive(p2_browser.get());
   VerifyProfileNamedIsActive(@"Profile 2", __LINE__);
 
   // Close the browser and make sure it's still active.
   p2_browser.reset();
   VerifyProfileNamedIsActive(@"Profile 2", __LINE__);
 
   // Open a new browser and make sure it takes effect.
-  scoped_ptr<Browser> p3_browser(new Browser(Browser::TYPE_TABBED, profile3));
+  scoped_ptr<Browser> p3_browser(
+      chrome::CreateBrowserWithTestWindowForProfile(profile3));
   BrowserList::SetLastActive(p3_browser.get());
   VerifyProfileNamedIsActive(@"Profile 3", __LINE__);
 
   p3_browser.reset();
   VerifyProfileNamedIsActive(@"Profile 3", __LINE__);
 }