| 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 d6348af82bdb5305f5143d9b3606870731bd74ee..760a7fb345e5c413677fac0bbbfa43844f967275 100644
|
| --- a/chrome/browser/extensions/api/management/management_apitest.cc
|
| +++ b/chrome/browser/extensions/api/management/management_apitest.cc
|
| @@ -224,8 +224,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, DISABLED_LaunchPanelApp) {
|
| ASSERT_FALSE(HasFatalFailure()); // Stop the test if any ASSERT failed.
|
|
|
| // Find the app's browser. Check that it is a popup.
|
| - ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(),
|
| - browser()->host_desktop_type()));
|
| + ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
|
| Browser* app_browser = FindOtherBrowser(browser());
|
| ASSERT_TRUE(app_browser->is_type_popup());
|
| ASSERT_TRUE(app_browser->is_app());
|
| @@ -240,8 +239,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, DISABLED_LaunchPanelApp) {
|
|
|
| // Unload the extension.
|
| UninstallExtension(app_id);
|
| - ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
|
| - browser()->host_desktop_type()));
|
| + ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
|
| ASSERT_FALSE(service->GetExtensionById(app_id, true));
|
|
|
| // Set a pref indicating that the user wants to launch in a regular tab.
|
| @@ -259,8 +257,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, DISABLED_LaunchPanelApp) {
|
|
|
| // Find the app's browser. Apps that should load in a panel ignore
|
| // prefs, so we should still see the launch in a popup.
|
| - ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile(),
|
| - browser()->host_desktop_type()));
|
| + ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
|
| app_browser = FindOtherBrowser(browser());
|
| ASSERT_TRUE(app_browser->is_type_popup());
|
| ASSERT_TRUE(app_browser->is_app());
|
| @@ -285,8 +282,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, MAYBE_LaunchTabApp) {
|
|
|
| // Code below assumes that the test starts with a single browser window
|
| // hosting one tab.
|
| - ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
|
| - browser()->host_desktop_type()));
|
| + ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
|
| ASSERT_EQ(1, browser()->tab_strip_model()->count());
|
|
|
| // Load an app with app.launch.container = "tab".
|
| @@ -295,14 +291,12 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, MAYBE_LaunchTabApp) {
|
| ASSERT_FALSE(HasFatalFailure());
|
|
|
| // Check that the app opened in a new tab of the existing browser.
|
| - ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
|
| - browser()->host_desktop_type()));
|
| + ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
|
| ASSERT_EQ(2, browser()->tab_strip_model()->count());
|
|
|
| // Unload the extension.
|
| UninstallExtension(app_id);
|
| - ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile(),
|
| - browser()->host_desktop_type()));
|
| + ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
|
| ASSERT_FALSE(service->GetExtensionById(app_id, true));
|
|
|
| // Set a pref indicating that the user wants to launch in a window.
|
| @@ -328,8 +322,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, MAYBE_LaunchTabApp) {
|
| // Find the app's browser. Opening in a new window will create
|
| // a new browser.
|
| ASSERT_EQ(expected_browser_count,
|
| - chrome::GetBrowserCount(browser()->profile(),
|
| - browser()->host_desktop_type()));
|
| + chrome::GetBrowserCount(browser()->profile()));
|
| if (expected_browser_count == 2) {
|
| Browser* app_browser = FindOtherBrowser(browser());
|
| ASSERT_TRUE(app_browser->is_app());
|
|
|