Remove old webui History page on desktop and mobile

chrome/browser/history/history_browsertest.cc

Index: chrome/browser/history/history_browsertest.cc
diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc
index 145351d7de560611a9e8154de8b8bc17ed55ff3a..353f0dcdf172a77c8e9d138790114ca54fd37598 100644
--- a/chrome/browser/history/history_browsertest.cc
+++ b/chrome/browser/history/history_browsertest.cc
@@ -12,7 +12,6 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ -21,8 +20,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/chrome_features.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -285,17 +282,9 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest,
 }
 
 // http://crbug.com/22111 (linux), http://crbug.com/530246 (win)
-#if defined(OS_LINUX) || defined(OS_WIN)
-#define MAYBE_HistorySearchXSS DISABLED_HistorySearchXSS
-#else
-#define MAYBE_HistorySearchXSS HistorySearchXSS
-#endif
-IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, MAYBE_HistorySearchXSS) {
+IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, DISABLED_HistorySearchXSS) {

[sky, 2017/04/27 22:41:04]

How come this is being disabled everywhere not? Also, the comment on the
previous line is now out of date.

[Dan Beam, 2017/04/28 03:17:45]

why are the comments out of date?  they apply to why this was previously
disabled because of flakiness.

it's now being disabled because the new page loads in far more complex way. 
blocking on loading in a lazily-loaded polymer page is a little more involved,
and I consulted calamity@ and tsergeant@ over chat to ensure this was the right
thing to do for this test.

also, for what it's worth: it was only possible that this XSS problem exhibits
when using .innerHTML, which the new page does not (so I'm basically just
disabling a totallly precautionary regression test that's flaky).

are you OK with that?  should I add a TODO?

[sky, 2017/04/28 17:43:53]

Before your change it was easy to correlate the comment with the code (eg linux
comment and OS_LINUX, windows comments and OS_WIN). Now the test is disabled
everywhere and there is no comment about mac. So, yes, please update the
comment. I would hope there is a single bug you can refer to that covers all
OSs, but you know better than I.

[Dan Beam, 2017/04/29 02:39:43]

Done.

   // TODO(tsergeant): Enable this test on MD History once it is possible to pass
   // in a query via URL (crbug.com/619799).
-  base::test::ScopedFeatureList scoped_feature_list;
-  scoped_feature_list.InitAndDisableFeature(features::kMaterialDesignHistory);
-
   GURL url(std::string(chrome::kChromeUIHistoryURL) +
       "#q=%3Cimg%20src%3Dx%3Ax%20onerror%3D%22document.title%3D'XSS'%22%3E");
   ui_test_utils::NavigateToURL(browser(), url);