diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/browser_window_controller_unittest.mm')
-rw-r--r-- | chrome/browser/ui/cocoa/browser_window_controller_unittest.mm | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 66dc242..a8d1962 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -121,7 +121,7 @@ TEST_F(BrowserWindowControllerTest, TestNormal) { // 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 = @@ -138,7 +138,7 @@ 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]); @@ -163,7 +163,7 @@ 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]); @@ -206,8 +206,8 @@ TEST_F(BrowserWindowControllerTest, BookmarkBarControllerIndirection) { 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]); @@ -675,7 +675,6 @@ void WaitForFullScreenTransition() { } TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) { - CreateBrowserWindow(); [controller_ showWindow:nil]; EXPECT_FALSE([controller_ isFullscreen]); @@ -694,7 +693,6 @@ TEST_F(BrowserWindowFullScreenControllerTest, TestFullscreen) { // 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]); |