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

Side by Side Diff: chrome/browser/history/history_browsertest.cc

Issue 2048553002: MD History: Enable by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests Created 4 years, 6 months 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
« no previous file with comments | « no previous file | chrome/browser/ui/find_bar/find_bar_host_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/feature_list.h"
10 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
13 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
14 #include "build/build_config.h" 15 #include "build/build_config.h"
15 #include "chrome/app/chrome_command_ids.h" 16 #include "chrome/app/chrome_command_ids.h"
16 #include "chrome/browser/history/history_service_factory.h" 17 #include "chrome/browser/history/history_service_factory.h"
17 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser.h" 19 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_commands.h" 20 #include "chrome/browser/ui/browser_commands.h"
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" 21 #include "chrome/browser/ui/tabs/tab_strip_model.h"
22 #include "chrome/common/chrome_features.h"
21 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
22 #include "chrome/common/pref_names.h" 24 #include "chrome/common/pref_names.h"
23 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
24 #include "chrome/test/base/in_process_browser_test.h" 26 #include "chrome/test/base/in_process_browser_test.h"
25 #include "chrome/test/base/ui_test_utils.h" 27 #include "chrome/test/base/ui_test_utils.h"
26 #include "components/history/core/browser/history_db_task.h" 28 #include "components/history/core/browser/history_db_task.h"
27 #include "components/history/core/browser/history_service.h" 29 #include "components/history/core/browser/history_service.h"
28 #include "components/prefs/pref_service.h" 30 #include "components/prefs/pref_service.h"
29 #include "content/public/browser/web_contents.h" 31 #include "content/public/browser/web_contents.h"
30 #include "content/public/test/browser_test_utils.h" 32 #include "content/public/test/browser_test_utils.h"
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 LoadAndWaitForFile("history_length_test_page_21.html"); 288 LoadAndWaitForFile("history_length_test_page_21.html");
287 } 289 }
288 290
289 // http://crbug.com/22111 (linux), http://crbug.com/530246 (win) 291 // http://crbug.com/22111 (linux), http://crbug.com/530246 (win)
290 #if defined(OS_LINUX) || defined(OS_WIN) 292 #if defined(OS_LINUX) || defined(OS_WIN)
291 #define MAYBE_HistorySearchXSS DISABLED_HistorySearchXSS 293 #define MAYBE_HistorySearchXSS DISABLED_HistorySearchXSS
292 #else 294 #else
293 #define MAYBE_HistorySearchXSS HistorySearchXSS 295 #define MAYBE_HistorySearchXSS HistorySearchXSS
294 #endif 296 #endif
295 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, MAYBE_HistorySearchXSS) { 297 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, MAYBE_HistorySearchXSS) {
298 // TODO(tsergeant): Enable this test on MD History once it is possible to pass
299 // in a query via URL (crbug.com/619799).
300 std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
301 feature_list->InitializeFromCommandLine(
302 std::string(), features::kMaterialDesignHistoryFeature.name);
303 base::FeatureList::ClearInstanceForTesting();
304 base::FeatureList::SetInstance(std::move(feature_list));
Dan Beam 2016/06/14 21:24:27 can you make this a utility method?
tsergeant 2016/06/14 23:58:02 Do you mean something like MDHistoryUI::DisableFor
Dan Beam 2016/06/14 23:59:52 yes
tsergeant 2016/06/15 01:57:29 Done.
305
296 GURL url(std::string(chrome::kChromeUIHistoryURL) + 306 GURL url(std::string(chrome::kChromeUIHistoryURL) +
297 "#q=%3Cimg%20src%3Dx%3Ax%20onerror%3D%22document.title%3D'XSS'%22%3E"); 307 "#q=%3Cimg%20src%3Dx%3Ax%20onerror%3D%22document.title%3D'XSS'%22%3E");
298 ui_test_utils::NavigateToURL(browser(), url); 308 ui_test_utils::NavigateToURL(browser(), url);
299 // Mainly, this is to ensure we send a synchronous message to the renderer 309 // 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. 310 // 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. 311 // Should a race condition ever trigger, it won't result in flakiness.
302 int num = ui_test_utils::FindInPage( 312 int num = ui_test_utils::FindInPage(
303 browser()->tab_strip_model()->GetActiveWebContents(), 313 browser()->tab_strip_model()->GetActiveWebContents(),
304 base::ASCIIToUTF16("<img"), true, 314 base::ASCIIToUTF16("<img"), true,
305 true, NULL, NULL); 315 true, NULL, NULL);
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 547
538 content::WebContents* active_web_contents = 548 content::WebContents* active_web_contents =
539 browser()->tab_strip_model()->GetActiveWebContents(); 549 browser()->tab_strip_model()->GetActiveWebContents();
540 ASSERT_EQ(web_contents, active_web_contents); 550 ASSERT_EQ(web_contents, active_web_contents);
541 ASSERT_EQ(history_url, active_web_contents->GetURL()); 551 ASSERT_EQ(history_url, active_web_contents->GetURL());
542 552
543 content::WebContents* second_tab = 553 content::WebContents* second_tab =
544 browser()->tab_strip_model()->GetWebContentsAt(1); 554 browser()->tab_strip_model()->GetWebContentsAt(1);
545 ASSERT_NE(history_url, second_tab->GetURL()); 555 ASSERT_NE(history_url, second_tab->GetURL());
546 } 556 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/find_bar/find_bar_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698