| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/task_manager/task_manager.h" | 5 #include "chrome/browser/task_manager/task_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| 11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
| 15 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
| 16 #include "chrome/browser/devtools/devtools_window_testing.h" | 16 #include "chrome/browser/devtools/devtools_window_testing.h" |
| 17 #include "chrome/browser/extensions/extension_browsertest.h" | 17 #include "chrome/browser/extensions/extension_browsertest.h" |
| 18 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
| 19 #include "chrome/browser/infobars/infobar_service.h" | 19 #include "chrome/browser/infobars/infobar_service.h" |
| 20 #include "chrome/browser/notifications/notification.h" | 20 #include "chrome/browser/notifications/notification.h" |
| 21 #include "chrome/browser/notifications/notification_test_util.h" | 21 #include "chrome/browser/notifications/notification_test_util.h" |
| 22 #include "chrome/browser/notifications/notification_ui_manager.h" | 22 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 23 #include "chrome/browser/profiles/profile.h" | 23 #include "chrome/browser/profiles/profile.h" |
| 24 #include "chrome/browser/task_management/task_manager_browsertest_util.h" |
| 24 #include "chrome/browser/task_management/task_manager_tester.h" | 25 #include "chrome/browser/task_management/task_manager_tester.h" |
| 25 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | |
| 26 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
| 27 #include "chrome/browser/ui/browser_commands.h" | 27 #include "chrome/browser/ui/browser_commands.h" |
| 28 #include "chrome/browser/ui/browser_dialogs.h" | 28 #include "chrome/browser/ui/browser_dialogs.h" |
| 29 #include "chrome/browser/ui/browser_window.h" | 29 #include "chrome/browser/ui/browser_window.h" |
| 30 #include "chrome/browser/ui/panels/panel.h" | 30 #include "chrome/browser/ui/panels/panel.h" |
| 31 #include "chrome/browser/ui/panels/panel_manager.h" | 31 #include "chrome/browser/ui/panels/panel_manager.h" |
| 32 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 32 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 33 #include "chrome/browser/web_applications/web_app.h" | 33 #include "chrome/browser/web_applications/web_app.h" |
| 34 #include "chrome/common/chrome_switches.h" | 34 #include "chrome/common/chrome_switches.h" |
| 35 #include "chrome/grit/generated_resources.h" | 35 #include "chrome/grit/generated_resources.h" |
| 36 #include "chrome/test/base/in_process_browser_test.h" | 36 #include "chrome/test/base/in_process_browser_test.h" |
| 37 #include "chrome/test/base/ui_test_utils.h" | 37 #include "chrome/test/base/ui_test_utils.h" |
| 38 #include "components/infobars/core/confirm_infobar_delegate.h" | 38 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 39 #include "components/infobars/core/infobar.h" | 39 #include "components/infobars/core/infobar.h" |
| 40 #include "content/public/browser/notification_service.h" | 40 #include "content/public/browser/notification_service.h" |
| 41 #include "content/public/browser/page_navigator.h" | 41 #include "content/public/browser/page_navigator.h" |
| 42 #include "content/public/browser/render_frame_host.h" | 42 #include "content/public/browser/render_frame_host.h" |
| 43 #include "content/public/test/browser_test_utils.h" | 43 #include "content/public/test/browser_test_utils.h" |
| 44 #include "content/public/test/content_browser_test_utils.h" | 44 #include "content/public/test/content_browser_test_utils.h" |
| 45 #include "extensions/browser/extension_system.h" | 45 #include "extensions/browser/extension_system.h" |
| 46 #include "extensions/common/extension.h" | 46 #include "extensions/common/extension.h" |
| 47 #include "net/dns/mock_host_resolver.h" | 47 #include "net/dns/mock_host_resolver.h" |
| 48 #include "net/test/embedded_test_server/embedded_test_server.h" | 48 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 49 #include "testing/gtest/include/gtest/gtest.h" | 49 #include "testing/gtest/include/gtest/gtest.h" |
| 50 #include "ui/base/l10n/l10n_util.h" | 50 #include "ui/base/l10n/l10n_util.h" |
| 51 #include "ui/base/page_transition_types.h" | 51 #include "ui/base/page_transition_types.h" |
| 52 | 52 |
| 53 using content::WebContents; | 53 using content::WebContents; |
| 54 using task_manager::browsertest_util::ColumnSpecifier; | 54 using task_management::browsertest_util::ColumnSpecifier; |
| 55 using task_manager::browsertest_util::MatchAboutBlankTab; | 55 using task_management::browsertest_util::MatchAboutBlankTab; |
| 56 using task_manager::browsertest_util::MatchAnyApp; | 56 using task_management::browsertest_util::MatchAnyApp; |
| 57 using task_manager::browsertest_util::MatchAnyExtension; | 57 using task_management::browsertest_util::MatchAnyExtension; |
| 58 using task_manager::browsertest_util::MatchAnySubframe; | 58 using task_management::browsertest_util::MatchAnySubframe; |
| 59 using task_manager::browsertest_util::MatchAnyTab; | 59 using task_management::browsertest_util::MatchAnyTab; |
| 60 using task_manager::browsertest_util::MatchAnyUtility; | 60 using task_management::browsertest_util::MatchAnyUtility; |
| 61 using task_manager::browsertest_util::MatchApp; | 61 using task_management::browsertest_util::MatchApp; |
| 62 using task_manager::browsertest_util::MatchExtension; | 62 using task_management::browsertest_util::MatchExtension; |
| 63 using task_manager::browsertest_util::MatchSubframe; | 63 using task_management::browsertest_util::MatchSubframe; |
| 64 using task_manager::browsertest_util::MatchTab; | 64 using task_management::browsertest_util::MatchTab; |
| 65 using task_manager::browsertest_util::MatchUtility; | 65 using task_management::browsertest_util::MatchUtility; |
| 66 using task_manager::browsertest_util::WaitForTaskManagerRows; | 66 using task_management::browsertest_util::WaitForTaskManagerRows; |
| 67 using task_manager::browsertest_util::WaitForTaskManagerStatToExceed; | 67 using task_management::browsertest_util::WaitForTaskManagerStatToExceed; |
| 68 | 68 |
| 69 namespace { | 69 namespace { |
| 70 | 70 |
| 71 const base::FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html"); | 71 const base::FilePath::CharType* kTitle1File = FILE_PATH_LITERAL("title1.html"); |
| 72 | 72 |
| 73 } // namespace | 73 } // namespace |
| 74 | 74 |
| 75 // TODO(nick): Move this file into task_management. https://crbug.com/606963 | 75 // TODO(nick): Move this file into task_management. https://crbug.com/606963 |
| 76 class TaskManagerBrowserTest : public ExtensionBrowserTest { | 76 class TaskManagerBrowserTest : public ExtensionBrowserTest { |
| 77 public: | 77 public: |
| (...skipping 1154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1232 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); | 1232 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); |
| 1233 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1233 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
| 1234 | 1234 |
| 1235 HideTaskManager(); | 1235 HideTaskManager(); |
| 1236 ShowTaskManager(); | 1236 ShowTaskManager(); |
| 1237 | 1237 |
| 1238 ASSERT_NO_FATAL_FAILURE( | 1238 ASSERT_NO_FATAL_FAILURE( |
| 1239 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); | 1239 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); |
| 1240 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); | 1240 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); |
| 1241 } | 1241 } |
| OLD | NEW |