Consolidate Browser Creation.

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include "base/mac/mac_util.h"
 #import "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 103 matching lines @@
   [controller_ updateBookmarkBarVisibilityWithAnimation:NO];
 
   // Make sure a normal BrowserWindowController is, uh, normal.
   EXPECT_TRUE([controller_ isTabbedWindow]);
   EXPECT_TRUE([controller_ hasTabStrip]);
   EXPECT_FALSE([controller_ hasTitleBar]);
   EXPECT_TRUE([controller_ isBookmarkBarVisible]);
 
   // And make sure a controller for a pop-up window is not normal.
   // popup_browser will be owned by its window.
-  Browser* popup_browser(Browser::CreateWithParams(
+  Browser* popup_browser(new Browser(
       Browser::CreateParams(Browser::TYPE_POPUP, profile())));
   NSWindow *cocoaWindow = popup_browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
       static_cast<BrowserWindowController*>([cocoaWindow windowController]);
   ASSERT_TRUE([controller isKindOfClass:[BrowserWindowController class]]);
   EXPECT_FALSE([controller isTabbedWindow]);
   EXPECT_FALSE([controller hasTabStrip]);
   EXPECT_TRUE([controller hasTitleBar]);
   EXPECT_FALSE([controller isBookmarkBarVisible]);
   [controller close];
 }
 
 TEST_F(BrowserWindowControllerTest, TestSetBounds) {
   // Create a normal browser with bounds smaller than the minimum.
   Browser::CreateParams params(Browser::TYPE_TABBED, profile());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
-  Browser* browser = Browser::CreateWithParams(params);
+  Browser* browser = new Browser(params);
   NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
     static_cast<BrowserWindowController*>([cocoaWindow windowController]);
 
   ASSERT_TRUE([controller isTabbedWindow]);
   BrowserWindow* browser_window = [controller browserWindow];
   EXPECT_EQ(browser_window, browser->window());
   gfx::Rect bounds = browser_window->GetBounds();
   EXPECT_EQ(400, bounds.width());
   EXPECT_EQ(272, bounds.height());
 
   // Try to set the bounds smaller than the minimum.
   browser_window->SetBounds(gfx::Rect(0, 0, 50, 50));
   bounds = browser_window->GetBounds();
   EXPECT_EQ(400, bounds.width());
   EXPECT_EQ(272, bounds.height());
 
   [controller close];
 }
 
 TEST_F(BrowserWindowControllerTest, TestSetBoundsPopup) {
   // Create a popup with bounds smaller than the minimum.
   Browser::CreateParams params(Browser::TYPE_POPUP, profile());
   params.initial_bounds = gfx::Rect(0, 0, 50, 50);
-  Browser* browser = Browser::CreateWithParams(params);
+  Browser* browser = new Browser(params);
   NSWindow *cocoaWindow = browser->window()->GetNativeWindow();
   BrowserWindowController* controller =
     static_cast<BrowserWindowController*>([cocoaWindow windowController]);
 
   ASSERT_FALSE([controller isTabbedWindow]);
   BrowserWindow* browser_window = [controller browserWindow];
   EXPECT_EQ(browser_window, browser->window());
   gfx::Rect bounds = browser_window->GetBounds();
   EXPECT_EQ(100, bounds.width());
   EXPECT_EQ(122, bounds.height());
@@ skipping 22 matching lines @@
   [controller_ updateBookmarkBarVisibilityWithAnimation:NO];
   EXPECT_TRUE([controller_ isBookmarkBarVisible]);
 }
 
 #if 0
 // TODO(jrg): This crashes trying to create the BookmarkBarController, adding
 // an observer to the BookmarkModel.
 TEST_F(BrowserWindowControllerTest, TestIncognitoWidthSpace) {
   scoped_ptr<TestingProfile> incognito_profile(new TestingProfile());
   incognito_profile->set_off_the_record(true);
-  scoped_ptr<Browser> browser(new Browser(Browser::TYPE_TABBED,
-                                          incognito_profile.get()));
+  scoped_ptr<Browser> browser(
+      new Browser(Browser::CreateParams(incognito_profile.get()));
   controller_.reset([[BrowserWindowController alloc]
                               initWithBrowser:browser.get()
                                 takeOwnership:NO]);
 
   NSRect tabFrame = [[controller_ tabStripView] frame];
   [controller_ installIncognitoBadge];
   NSRect newTabFrame = [[controller_ tabStripView] frame];
   EXPECT_GT(tabFrame.size.width, newTabFrame.size.width);
 
   controller_.release();
@@ skipping 447 matching lines @@
 }
 
 void WaitForFullScreenTransition() {
   content::WindowedNotificationObserver observer(
       chrome::NOTIFICATION_FULLSCREEN_CHANGED,
       content::NotificationService::AllSources());
   observer.Wait();
 }
 
 TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) {
-  CreateBrowserWindow();
   [controller_ showWindow:nil];
   EXPECT_FALSE([controller_ isFullscreen]);
 
   [controller_ enterFullscreenForURL:GURL()
                        bubbleType:FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION];
   WaitForFullScreenTransition();
   EXPECT_TRUE([controller_ isFullscreen]);
 
   [controller_ exitFullscreen];
   WaitForFullScreenTransition();
   EXPECT_FALSE([controller_ isFullscreen]);
 }
 
 // If this test fails, it is usually a sign that the bots have some sort of
 // problem (such as a modal dialog up).  This tests is a very useful canary, so
 // please do not mark it as flaky without first verifying that there are no bot
 // problems.
 TEST_F(BrowserWindowFullScreenControllerTest, TestActivate) {
-  CreateBrowserWindow();
   [controller_ showWindow:nil];
 
   EXPECT_FALSE([controller_ isFullscreen]);
 
   [controller_ activate];
   EXPECT_TRUE(IsFrontWindow([controller_ window]));
 
   [controller_ enterFullscreenForURL:GURL()
                        bubbleType:FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION];
   WaitForFullScreenTransition();
@@ skipping 21 matching lines @@
   testFullscreenWindow_.reset(
       [[NSWindow alloc] initWithContentRect:NSMakeRect(0,0,400,400)
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   return testFullscreenWindow_.get();
 }
 @end
 
 /* TODO(???): test other methods of BrowserWindowController */