OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <utility> | 5 #include <utility> |
6 #include <vector> | 6 #include <vector> |
7 | 7 |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/browser/history/history_service_factory.h" | 16 #include "chrome/browser/history/history_service_factory.h" |
17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
19 #include "chrome/browser/ui/browser_commands.h" | 19 #include "chrome/browser/ui/browser_commands.h" |
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 21 #include "chrome/browser/ui/webui/md_history_ui.h" |
21 #include "chrome/common/chrome_switches.h" | 22 #include "chrome/common/chrome_switches.h" |
22 #include "chrome/common/pref_names.h" | 23 #include "chrome/common/pref_names.h" |
23 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
24 #include "chrome/test/base/in_process_browser_test.h" | 25 #include "chrome/test/base/in_process_browser_test.h" |
25 #include "chrome/test/base/ui_test_utils.h" | 26 #include "chrome/test/base/ui_test_utils.h" |
26 #include "components/history/core/browser/history_db_task.h" | 27 #include "components/history/core/browser/history_db_task.h" |
27 #include "components/history/core/browser/history_service.h" | 28 #include "components/history/core/browser/history_service.h" |
28 #include "components/prefs/pref_service.h" | 29 #include "components/prefs/pref_service.h" |
29 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
30 #include "content/public/test/browser_test_utils.h" | 31 #include "content/public/test/browser_test_utils.h" |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 LoadAndWaitForFile("history_length_test_page_21.html"); | 287 LoadAndWaitForFile("history_length_test_page_21.html"); |
287 } | 288 } |
288 | 289 |
289 // http://crbug.com/22111 (linux), http://crbug.com/530246 (win) | 290 // http://crbug.com/22111 (linux), http://crbug.com/530246 (win) |
290 #if defined(OS_LINUX) || defined(OS_WIN) | 291 #if defined(OS_LINUX) || defined(OS_WIN) |
291 #define MAYBE_HistorySearchXSS DISABLED_HistorySearchXSS | 292 #define MAYBE_HistorySearchXSS DISABLED_HistorySearchXSS |
292 #else | 293 #else |
293 #define MAYBE_HistorySearchXSS HistorySearchXSS | 294 #define MAYBE_HistorySearchXSS HistorySearchXSS |
294 #endif | 295 #endif |
295 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, MAYBE_HistorySearchXSS) { | 296 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, MAYBE_HistorySearchXSS) { |
| 297 // TODO(tsergeant): Enable this test on MD History once it is possible to pass |
| 298 // in a query via URL (crbug.com/619799). |
| 299 MdHistoryUI::DisableForTesting(); |
| 300 |
296 GURL url(std::string(chrome::kChromeUIHistoryURL) + | 301 GURL url(std::string(chrome::kChromeUIHistoryURL) + |
297 "#q=%3Cimg%20src%3Dx%3Ax%20onerror%3D%22document.title%3D'XSS'%22%3E"); | 302 "#q=%3Cimg%20src%3Dx%3Ax%20onerror%3D%22document.title%3D'XSS'%22%3E"); |
298 ui_test_utils::NavigateToURL(browser(), url); | 303 ui_test_utils::NavigateToURL(browser(), url); |
299 // Mainly, this is to ensure we send a synchronous message to the renderer | 304 // Mainly, this is to ensure we send a synchronous message to the renderer |
300 // so that we're not susceptible (less susceptible?) to a race condition. | 305 // so that we're not susceptible (less susceptible?) to a race condition. |
301 // Should a race condition ever trigger, it won't result in flakiness. | 306 // Should a race condition ever trigger, it won't result in flakiness. |
302 int num = ui_test_utils::FindInPage( | 307 int num = ui_test_utils::FindInPage( |
303 browser()->tab_strip_model()->GetActiveWebContents(), | 308 browser()->tab_strip_model()->GetActiveWebContents(), |
304 base::ASCIIToUTF16("<img"), true, | 309 base::ASCIIToUTF16("<img"), true, |
305 true, NULL, NULL); | 310 true, NULL, NULL); |
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
537 | 542 |
538 content::WebContents* active_web_contents = | 543 content::WebContents* active_web_contents = |
539 browser()->tab_strip_model()->GetActiveWebContents(); | 544 browser()->tab_strip_model()->GetActiveWebContents(); |
540 ASSERT_EQ(web_contents, active_web_contents); | 545 ASSERT_EQ(web_contents, active_web_contents); |
541 ASSERT_EQ(history_url, active_web_contents->GetURL()); | 546 ASSERT_EQ(history_url, active_web_contents->GetURL()); |
542 | 547 |
543 content::WebContents* second_tab = | 548 content::WebContents* second_tab = |
544 browser()->tab_strip_model()->GetWebContentsAt(1); | 549 browser()->tab_strip_model()->GetWebContentsAt(1); |
545 ASSERT_NE(history_url, second_tab->GetURL()); | 550 ASSERT_NE(history_url, second_tab->GetURL()); |
546 } | 551 } |
OLD | NEW |