| Index: chrome/browser/ui/panels/panel_browsertest.cc
|
| diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
|
| index 66125ec6a4b094b4dcd6f4ba15e03f07c357000d..32127b3eb56daf958784edeca716ae5c1c69d315 100644
|
| --- a/chrome/browser/ui/panels/panel_browsertest.cc
|
| +++ b/chrome/browser/ui/panels/panel_browsertest.cc
|
| @@ -14,7 +14,6 @@
|
| #include "chrome/browser/net/url_request_mock_util.h"
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| -#include "chrome/browser/task_management/task_management_browsertest_util.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| @@ -1767,92 +1766,3 @@ IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest,
|
| ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
|
| ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_;
|
| }
|
| -
|
| -#if defined(ENABLE_TASK_MANAGER)
|
| -
|
| -namespace {
|
| -
|
| -base::string16 GetExpectedPrefix() {
|
| - return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_EXTENSION_PREFIX,
|
| - base::string16());
|
| -}
|
| -
|
| -const std::vector<task_management::WebContentsTag*>& GetTrackedTags() {
|
| - return task_management::WebContentsTagsManager::GetInstance()->
|
| - tracked_tags();
|
| -}
|
| -
|
| -// Tests that the task manager tags are recorded correctly as a result of
|
| -// creating panels.
|
| -IN_PROC_BROWSER_TEST_F(PanelBrowserTest, TaskManagementTagsBasic) {
|
| - // Browser tests start with a single tab.
|
| - EXPECT_EQ(1U, GetTrackedTags().size());
|
| -
|
| - // Create a bunch of panels.
|
| - gfx::Rect bounds(300, 200, 250, 200);
|
| - CreatePanelParams params("PanelTest1", bounds, SHOW_AS_ACTIVE);
|
| - params.url = GURL("about:blank");
|
| - CreatePanelWithParams(params);
|
| - EXPECT_EQ(2U, GetTrackedTags().size());
|
| -
|
| - params.name = std::string("PanelTest2_Detached");
|
| - params.wait_for_fully_created = false;
|
| - params.create_mode = PanelManager::CREATE_AS_DETACHED;
|
| - CreatePanelWithParams(params);
|
| - EXPECT_EQ(3U, GetTrackedTags().size());
|
| -
|
| - params.name = std::string("PanelTest3_Docked");
|
| - params.create_mode = PanelManager::CREATE_AS_DOCKED;
|
| - CreatePanelWithParams(params);
|
| - EXPECT_EQ(4U, GetTrackedTags().size());
|
| -
|
| - params.name = std::string("PanelTest3_Inactive");
|
| - params.show_flag = SHOW_AS_INACTIVE;
|
| - CreatePanelWithParams(params);
|
| - EXPECT_EQ(5U, GetTrackedTags().size());
|
| -
|
| - // Close all panels and make sure the tags are removed.
|
| - PanelManager::GetInstance()->CloseAll();
|
| - EXPECT_EQ(1U, GetTrackedTags().size());
|
| -}
|
| -
|
| -// Tests that the task manager sees the PanelTasks as a result of creating
|
| -// panels, and removes the PanelTasks as a result of closing panels.
|
| -IN_PROC_BROWSER_TEST_F(PanelBrowserTest, TaskManagementTasksProvided) {
|
| - task_management::MockWebContentsTaskManager task_manager;
|
| - // Browser tests start with a single tab.
|
| - EXPECT_EQ(1U, GetTrackedTags().size());
|
| -
|
| - // Create a single panel.
|
| - gfx::Rect bounds(300, 200, 250, 200);
|
| - CreatePanelParams params("PanelTest1", bounds, SHOW_AS_ACTIVE);
|
| - params.url = GURL("about:blank");
|
| - CreatePanelWithParams(params);
|
| - EXPECT_EQ(2U, GetTrackedTags().size());
|
| -
|
| - task_manager.StartObserving();
|
| -
|
| - // The pre-existing tab and panel are provided.
|
| - EXPECT_EQ(2U, task_manager.tasks().size());
|
| -
|
| - // Create one more panel.
|
| - params.name = std::string("PanelTest2");
|
| - CreatePanelWithParams(params);
|
| - EXPECT_EQ(3U, GetTrackedTags().size());
|
| - ASSERT_EQ(3U, task_manager.tasks().size());
|
| -
|
| - const task_management::Task* task = task_manager.tasks().back();
|
| - EXPECT_EQ(task_management::Task::EXTENSION, task->GetType());
|
| - const base::string16 title = task->title();
|
| - const base::string16 expected_prefix = GetExpectedPrefix();
|
| - EXPECT_TRUE(base::StartsWith(title,
|
| - expected_prefix,
|
| - base::CompareCase::INSENSITIVE_ASCII));
|
| -
|
| - PanelManager::GetInstance()->CloseAll();
|
| - EXPECT_EQ(1U, task_manager.tasks().size());
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -#endif // defined(ENABLE_TASK_MANAGER)
|
|
|