Index: chrome/browser/extensions/api/management/management_apitest.cc |
diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc |
index f0ba11c7cbb3fc2beb3a3c115271486c879161a4..d64a32e3d8a96bbfded7e81178460900c3bf1cff 100644 |
--- a/chrome/browser/extensions/api/management/management_apitest.cc |
+++ b/chrome/browser/extensions/api/management/management_apitest.cc |
@@ -7,6 +7,7 @@ |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
#include "chrome/browser/extensions/extension_service.h" |
+#include "chrome/browser/extensions/extension_util.h" |
#include "chrome/browser/extensions/launch_util.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ui/browser.h" |
@@ -310,12 +311,23 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, MAYBE_LaunchTabApp) { |
// If the ID changed, then the pref will not apply to the app. |
ASSERT_EQ(app_id, app_id_new); |
+ unsigned expected_browser_count = 2; |
+#if defined(OS_MACOSX) |
+ // Without the new Bookmark Apps, Mac has no way of making standalone browser |
+ // windows for apps, so it will add to the tabstrip instead. |
+ EXPECT_FALSE(extensions::util::IsNewBookmarkAppsEnabled()); |
+ expected_browser_count = 1; |
+ ASSERT_EQ(2, browser()->tab_strip_model()->count()); |
+#endif |
// Find the app's browser. Opening in a new window will create |
// a new browser. |
- ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(), |
- browser()->host_desktop_type())); |
- Browser* app_browser = FindOtherBrowser(browser()); |
- ASSERT_TRUE(app_browser->is_app()); |
+ ASSERT_EQ(expected_browser_count, |
+ chrome::GetBrowserCount(browser()->profile(), |
+ browser()->host_desktop_type())); |
+ if (expected_browser_count == 2) { |
+ Browser* app_browser = FindOtherBrowser(browser()); |
+ ASSERT_TRUE(app_browser->is_app()); |
+ } |
} |
IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchType) { |