diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 20:35:14 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-05 20:35:14 +0000 |
| commit | b35b26b360b5d84d064d63440590902d4974b59d (patch) | |
| tree | f0aa8b0b32ca80ad7eb5efc1f78a5dcd45899b13 /chrome/browser/ui/browser_init_browsertest.cc | |
| parent | 4d9160ff743804acf89a5a50a0b43c113aecc1ab (diff) | |
| download | chromium_src-b35b26b360b5d84d064d63440590902d4974b59d.zip chromium_src-b35b26b360b5d84d064d63440590902d4974b59d.tar.gz chromium_src-b35b26b360b5d84d064d63440590902d4974b59d.tar.bz2 | |
Browser::Type cleanup.
BUG=None
TEST=Existing tests
R=ben@chromium.org,stevenjb@chromium.org,phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/6697032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_init_browsertest.cc')
| -rw-r--r-- | chrome/browser/ui/browser_init_browsertest.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/ui/browser_init_browsertest.cc b/chrome/browser/ui/browser_init_browsertest.cc index e5e9a54..929ae83 100644 --- a/chrome/browser/ui/browser_init_browsertest.cc +++ b/chrome/browser/ui/browser_init_browsertest.cc @@ -88,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenURLsPopup) { Browser* popup = Browser::CreateForType(Browser::TYPE_POPUP, browser()->profile()); - ASSERT_EQ(popup->type(), Browser::TYPE_POPUP); + ASSERT_TRUE(popup->is_type_popup()); ASSERT_EQ(popup, observer.added_browser_); CommandLine dummy(CommandLine::NO_PROGRAM); @@ -122,7 +122,7 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenAppShortcutNoPref) { ASSERT_FALSE(HasFatalFailure()); // Expect an app window. - EXPECT_EQ(Browser::TYPE_APP, new_browser->type()); + EXPECT_TRUE(new_browser->is_app()); // The browser's app_name should include the app's ID. EXPECT_NE( @@ -151,7 +151,7 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenAppShortcutWindowPref) { ASSERT_FALSE(HasFatalFailure()); // Expect an app window. - EXPECT_EQ(Browser::TYPE_APP, new_browser->type()); + EXPECT_TRUE(new_browser->is_app()); // The browser's app_name should include the app's ID. EXPECT_NE( @@ -181,8 +181,8 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenAppShortcutTabPref) { FindOneOtherBrowser(&new_browser); ASSERT_FALSE(HasFatalFailure()); - // The tab should be in a normal window. - EXPECT_EQ(Browser::TYPE_NORMAL, new_browser->type()); + // The tab should be in a tabbed window. + EXPECT_TRUE(new_browser->is_type_tabbed()); // The browser's app_name should not include the app's ID: It is in a // normal browser. @@ -208,7 +208,11 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenAppShortcutPanel) { ASSERT_FALSE(HasFatalFailure()); // Expect an app panel. - EXPECT_EQ(Browser::TYPE_APP_POPUP, new_browser->type()); +#if defined(OS_CHROMEOS) + EXPECT_TRUE(new_browser->is_type_panel() && new_browser->is_app()); +#else + EXPECT_TRUE(new_browser->is_type_popup() && new_browser->is_app()); +#endif // The new browser's app_name should include the app's ID. EXPECT_NE( |