| OLD | NEW |
| 1 // Copyright 2016 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/base_features.h" |
| 8 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 9 #include "base/macros.h" | 10 #include "base/macros.h" |
| 10 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 11 #include "base/strings/stringprintf.h" | 12 #include "base/strings/stringprintf.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
| 14 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
| 15 #include "chrome/browser/chrome_notification_types.h" | 16 #include "chrome/browser/chrome_notification_types.h" |
| 16 #include "chrome/browser/devtools/devtools_window_testing.h" | 17 #include "chrome/browser/devtools/devtools_window_testing.h" |
| 17 #include "chrome/browser/extensions/extension_browsertest.h" | 18 #include "chrome/browser/extensions/extension_browsertest.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 32 #include "chrome/browser/web_applications/web_app.h" | 33 #include "chrome/browser/web_applications/web_app.h" |
| 33 #include "chrome/common/chrome_switches.h" | 34 #include "chrome/common/chrome_switches.h" |
| 34 #include "chrome/grit/generated_resources.h" | 35 #include "chrome/grit/generated_resources.h" |
| 35 #include "chrome/test/base/in_process_browser_test.h" | 36 #include "chrome/test/base/in_process_browser_test.h" |
| 36 #include "chrome/test/base/ui_test_utils.h" | 37 #include "chrome/test/base/ui_test_utils.h" |
| 37 #include "components/infobars/core/confirm_infobar_delegate.h" | 38 #include "components/infobars/core/confirm_infobar_delegate.h" |
| 38 #include "components/infobars/core/infobar.h" | 39 #include "components/infobars/core/infobar.h" |
| 39 #include "content/public/browser/notification_service.h" | 40 #include "content/public/browser/notification_service.h" |
| 40 #include "content/public/browser/page_navigator.h" | 41 #include "content/public/browser/page_navigator.h" |
| 41 #include "content/public/browser/render_frame_host.h" | 42 #include "content/public/browser/render_frame_host.h" |
| 42 #include "content/public/common/content_features.h" | |
| 43 #include "content/public/common/content_switches.h" | 43 #include "content/public/common/content_switches.h" |
| 44 #include "content/public/test/browser_test_utils.h" | 44 #include "content/public/test/browser_test_utils.h" |
| 45 #include "content/public/test/content_browser_test_utils.h" | 45 #include "content/public/test/content_browser_test_utils.h" |
| 46 #include "extensions/browser/extension_system.h" | 46 #include "extensions/browser/extension_system.h" |
| 47 #include "extensions/common/extension.h" | 47 #include "extensions/common/extension.h" |
| 48 #include "net/dns/mock_host_resolver.h" | 48 #include "net/dns/mock_host_resolver.h" |
| 49 #include "net/test/embedded_test_server/embedded_test_server.h" | 49 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 50 #include "testing/gmock/include/gmock/gmock.h" | 50 #include "testing/gmock/include/gmock/gmock.h" |
| 51 #include "testing/gtest/include/gtest/gtest.h" | 51 #include "testing/gtest/include/gtest/gtest.h" |
| 52 #include "ui/base/l10n/l10n_util.h" | 52 #include "ui/base/l10n/l10n_util.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 }; | 178 }; |
| 179 | 179 |
| 180 class TaskManagerMemoryCoordinatorBrowserTest : public TaskManagerBrowserTest { | 180 class TaskManagerMemoryCoordinatorBrowserTest : public TaskManagerBrowserTest { |
| 181 public: | 181 public: |
| 182 TaskManagerMemoryCoordinatorBrowserTest() {} | 182 TaskManagerMemoryCoordinatorBrowserTest() {} |
| 183 ~TaskManagerMemoryCoordinatorBrowserTest() override {} | 183 ~TaskManagerMemoryCoordinatorBrowserTest() override {} |
| 184 | 184 |
| 185 protected: | 185 protected: |
| 186 void SetUpCommandLine(base::CommandLine* command_line) override { | 186 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 187 command_line->AppendSwitchASCII(switches::kEnableFeatures, | 187 command_line->AppendSwitchASCII(switches::kEnableFeatures, |
| 188 features::kMemoryCoordinator.name); | 188 base::features::kMemoryCoordinator.name); |
| 189 } | 189 } |
| 190 | 190 |
| 191 private: | 191 private: |
| 192 DISALLOW_COPY_AND_ASSIGN(TaskManagerMemoryCoordinatorBrowserTest); | 192 DISALLOW_COPY_AND_ASSIGN(TaskManagerMemoryCoordinatorBrowserTest); |
| 193 }; | 193 }; |
| 194 | 194 |
| 195 // Parameterized variant of TaskManagerBrowserTest which runs with/without | 195 // Parameterized variant of TaskManagerBrowserTest which runs with/without |
| 196 // --site-per-process, which enables out of process iframes (OOPIFs). | 196 // --site-per-process, which enables out of process iframes (OOPIFs). |
| 197 class TaskManagerOOPIFBrowserTest : public TaskManagerBrowserTest, | 197 class TaskManagerOOPIFBrowserTest : public TaskManagerBrowserTest, |
| 198 public testing::WithParamInterface<bool> { | 198 public testing::WithParamInterface<bool> { |
| (...skipping 931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1130 | 1130 |
| 1131 // Because the subframes for tab 2 are nested, their order is deterministic. | 1131 // Because the subframes for tab 2 are nested, their order is deterministic. |
| 1132 EXPECT_EQ("Subframe: http://a.com/", | 1132 EXPECT_EQ("Subframe: http://a.com/", |
| 1133 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); | 1133 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 1))); |
| 1134 EXPECT_EQ("Subframe: http://c.com/", | 1134 EXPECT_EQ("Subframe: http://c.com/", |
| 1135 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); | 1135 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 2))); |
| 1136 EXPECT_EQ("Subframe: http://b.com/", | 1136 EXPECT_EQ("Subframe: http://b.com/", |
| 1137 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); | 1137 base::UTF16ToUTF8(model()->GetRowTitle(tab2_start + 3))); |
| 1138 } | 1138 } |
| 1139 } | 1139 } |
| OLD | NEW |