summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/cocoa/cocoa_profile_test.mm
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 20:14:29 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-25 20:14:29 +0000
commita4fe67013ea54ca4f550d8c27b55b180fe0c4a70 (patch)
treea2eb4697a22a3ea49aeece7a395286a6e84fda0f /chrome/browser/ui/cocoa/cocoa_profile_test.mm
parentf82480eb8c899f51177505494a485587c60e7ad4 (diff)
downloadchromium_src-a4fe67013ea54ca4f550d8c27b55b180fe0c4a70.zip
chromium_src-a4fe67013ea54ca4f550d8c27b55b180fe0c4a70.tar.gz
chromium_src-a4fe67013ea54ca4f550d8c27b55b180fe0c4a70.tar.bz2
Consolidate Browser Creation.
. Make all instantiators use a single ctor that takes CreateParams. . Get rid of InitBrowserWindow() and make CreateBrowserWindow() a anonymous namespace function in browser.cc http://crbug.com/133576 TEST=none Review URL: https://chromiumcodereview.appspot.com/10692195 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148396 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/cocoa_profile_test.mm')
-rw-r--r--chrome/browser/ui/cocoa/cocoa_profile_test.mm11
1 files changed, 5 insertions, 6 deletions
diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
index fdec1b0..ff1a029 100644
--- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm
+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm
@@ -71,7 +71,7 @@ void CocoaProfileTest::SetUp() {
AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
profile_, &AutocompleteClassifierFactory::BuildInstanceFor);
- browser_.reset(new Browser(Browser::TYPE_TABBED, profile_));
+ browser_.reset(CreateBrowser());
ASSERT_TRUE(browser_.get());
}
@@ -82,11 +82,6 @@ void CocoaProfileTest::TearDown() {
CocoaTest::TearDown();
}
-BrowserWindow* CocoaProfileTest::CreateBrowserWindow() {
- browser_->InitBrowserWindow();
- return browser_->window();
-}
-
void CocoaProfileTest::CloseBrowserWindow() {
// Check to make sure a window was actually created.
DCHECK(browser_->window());
@@ -95,3 +90,7 @@ void CocoaProfileTest::CloseBrowserWindow() {
// |browser_| will be deleted by its BrowserWindowController.
ignore_result(browser_.release());
}
+
+Browser* CocoaProfileTest::CreateBrowser() {
+ return new Browser(Browser::CreateParams(profile()));
+}