Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: chrome/browser/task_manager/providers/web_contents/subframe_task_browsertest.cc

Issue 2437253002: Improve TDI render process naming in the task manager. (Closed)
Patch Set: with test Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/command_line.h"
5 #include "base/macros.h" 6 #include "base/macros.h"
6 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/task_manager/mock_web_contents_task_manager.h" 8 #include "chrome/browser/task_manager/mock_web_contents_task_manager.h"
9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/grit/generated_resources.h" 11 #include "chrome/grit/generated_resources.h"
9 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
10 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "content/public/common/content_switches.h"
11 #include "content/public/test/browser_test_utils.h" 15 #include "content/public/test/browser_test_utils.h"
12 #include "content/public/test/test_utils.h" 16 #include "content/public/test/test_utils.h"
13 #include "net/dns/mock_host_resolver.h" 17 #include "net/dns/mock_host_resolver.h"
14 #include "net/test/embedded_test_server/embedded_test_server.h" 18 #include "net/test/embedded_test_server/embedded_test_server.h"
15 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
16 20
17 namespace task_manager { 21 namespace task_manager {
18 22
19 namespace { 23 namespace {
20 24
21 // URL of a test page on a.com that has two cross-site iframes to b.com and 25 // URL of a test page on a.com that has two cross-site iframes to b.com and
22 // c.com. 26 // c.com.
23 const char kCrossSitePageUrl[] = "/cross-site/a.com/iframe_cross_site.html"; 27 const char kCrossSitePageUrl[] = "/cross-site/a.com/iframe_cross_site.html";
24 28
25 // URL of a test page on a.com that has no cross-site iframes. 29 // URL of a test page on a.com that has no cross-site iframes.
26 const char kSimplePageUrl[] = "/cross-site/a.com/title2.html"; 30 const char kSimplePageUrl[] = "/cross-site/a.com/title2.html";
27 31
28 base::string16 GetExpectedSubframeTitlePrefix() { 32 base::string16 GetExpectedSubframeTitlePrefix() {
29 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_SUBFRAME_PREFIX, 33 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_SUBFRAME_PREFIX,
30 base::string16()); 34 base::string16());
31 } 35 }
32 36
33 base::string16 PrefixExpectedTabTitle(const char* title) { 37 base::string16 PrefixExpectedTabTitle(const std::string& title) {
34 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_TAB_PREFIX, 38 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_TAB_PREFIX,
35 base::UTF8ToUTF16(title)); 39 base::UTF8ToUTF16(title));
36 } 40 }
37 41
42 base::string16 PrefixExpectedTDIRowTitle(const std::string& title) {
43 return l10n_util::GetStringFUTF16(IDS_TASK_MANAGER_ISOLATED_SUBFRAMES_PREFIX,
44 base::UTF8ToUTF16(title));
45 }
46
38 } // namespace 47 } // namespace
39 48
40 // A test for OOPIFs and how they show up in the task manager as 49 // A test for OOPIFs and how they show up in the task manager as
41 // SubframeTasks. 50 // SubframeTasks.
42 class SubframeTaskBrowserTest : public InProcessBrowserTest { 51 class SubframeTaskBrowserTest : public InProcessBrowserTest {
43 public: 52 public:
44 SubframeTaskBrowserTest() {} 53 SubframeTaskBrowserTest() {}
45 ~SubframeTaskBrowserTest() override {} 54 ~SubframeTaskBrowserTest() override {}
46 55
47 void SetUpCommandLine(base::CommandLine* command_line) override { 56 void SetUpCommandLine(base::CommandLine* command_line) override {
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 // iframes, we expect not to have any SubframeTasks. 128 // iframes, we expect not to have any SubframeTasks.
120 NavigateTo(kSimplePageUrl); 129 NavigateTo(kSimplePageUrl);
121 130
122 ASSERT_EQ(1U, task_manager.tasks().size()); 131 ASSERT_EQ(1U, task_manager.tasks().size());
123 const Task* simple_page_task = task_manager.tasks().front(); 132 const Task* simple_page_task = task_manager.tasks().front();
124 EXPECT_EQ(Task::RENDERER, simple_page_task->GetType()); 133 EXPECT_EQ(Task::RENDERER, simple_page_task->GetType());
125 EXPECT_EQ(PrefixExpectedTabTitle("Title Of Awesomeness"), 134 EXPECT_EQ(PrefixExpectedTabTitle("Title Of Awesomeness"),
126 simple_page_task->title()); 135 simple_page_task->title());
127 } 136 }
128 137
138 // A test for top document isolation and how subframes show up in the task
139 // manager as SubframeTasks.
140 class SubframeTaskTDIBrowserTest : public InProcessBrowserTest {
141 public:
142 SubframeTaskTDIBrowserTest() {}
143 ~SubframeTaskTDIBrowserTest() override {}
144
145 void SetUpCommandLine(base::CommandLine* command_line) override {
146 InProcessBrowserTest::SetUpCommandLine(command_line);
147 command_line->AppendSwitch(switches::kTopDocumentIsolation);
148 }
149
150 void SetUpOnMainThread() override {
151 host_resolver()->AddRule("*", "127.0.0.1");
152 ASSERT_TRUE(embedded_test_server()->Start());
153 content::SetupCrossSiteRedirector(embedded_test_server());
154 }
155
156 void NavigateTo(const char* page_url) const {
157 ui_test_utils::NavigateToURL(browser(),
158 embedded_test_server()->GetURL(page_url));
159 }
160
161 private:
162 DISALLOW_COPY_AND_ASSIGN(SubframeTaskTDIBrowserTest);
163 };
164
165 // Makes sure that subframe row gets updated with the new title when the main
166 // frame's title changes.
167 IN_PROC_BROWSER_TEST_F(SubframeTaskTDIBrowserTest,
168 SubframeRowGetsUpdatedParentPageTitle) {
169 if (content::AreAllSitesIsolatedForTesting()) {
170 // If full site isolation is turned on, it supersedes top document
171 // isolation, so bail if it is.
172 return;
173 }
174
175 MockWebContentsTaskManager task_manager;
176 EXPECT_TRUE(task_manager.tasks().empty());
177 task_manager.StartObserving();
178
179 // Currently only the about:blank page.
180 ASSERT_EQ(1U, task_manager.tasks().size());
181 const Task* about_blank_task = task_manager.tasks().front();
182 EXPECT_EQ(Task::RENDERER, about_blank_task->GetType());
183 EXPECT_EQ(PrefixExpectedTabTitle("about:blank"), about_blank_task->title());
184
185 // Start with a known title, make sure everything starts correctly.
186 NavigateTo(kCrossSitePageUrl);
187
188 ASSERT_EQ(2U, task_manager.tasks().size());
189 const Task* main_task = task_manager.tasks()[0];
190 const Task* tdi_task = task_manager.tasks()[1];
191 EXPECT_EQ(Task::RENDERER, main_task->GetType());
192 EXPECT_EQ(Task::RENDERER, tdi_task->GetType());
193 std::string main_title = "cross-site iframe test";
194 EXPECT_EQ(PrefixExpectedTabTitle(main_title), main_task->title());
195 EXPECT_EQ(PrefixExpectedTDIRowTitle(main_title), tdi_task->title());
196
197 // Change the title on the main page, and make sure the TDI row reflects it.
198 std::string new_title = "new title";
199 std::string script = "document.title = '" + new_title + "'";
200 content::WebContents* web_contents =
201 browser()->tab_strip_model()->GetActiveWebContents();
202 content::TitleWatcher title_watcher(web_contents,
203 base::UTF8ToUTF16(new_title));
204 EXPECT_TRUE(ExecuteScript(web_contents, script));
205 base::string16 actual_title = title_watcher.WaitAndGetTitle();
206 EXPECT_EQ(new_title, base::UTF16ToUTF8(actual_title));
207
208 EXPECT_EQ(PrefixExpectedTabTitle(new_title), main_task->title());
209 EXPECT_EQ(PrefixExpectedTDIRowTitle(new_title), tdi_task->title());
210 }
211
129 } // namespace task_manager 212 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698