Remove old webui History page on desktop and mobile

chrome/browser/history/history_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #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"
 #include "chrome/browser/history/history_test_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/prefs/pref_service.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 242 matching lines @@
   //
   // -open-> Page 21 -redirect-> Page 22.
   //
   // If redirect occurs more than 5 seconds later after the page is loaded,
   // the redirect is likely to be user-initiated.
   // Therefore, Page 21 should be in the history in addition to Page 22.
   LoadAndWaitForFile("history_length_test_page_21.html");
 }
 
 // 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);
   // Mainly, this is to ensure we send a synchronous message to the renderer
   // so that we're not susceptible (less susceptible?) to a race condition.
   // Should a race condition ever trigger, it won't result in flakiness.
   int num = ui_test_utils::FindInPage(
       browser()->tab_strip_model()->GetActiveWebContents(),
       base::ASCIIToUTF16("<img"), true,
       true, NULL, NULL);
@@ skipping 306 matching lines @@
 
   content::WebContents* active_web_contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_EQ(web_contents, active_web_contents);
   ASSERT_EQ(history_url, active_web_contents->GetURL());
 
   content::WebContents* second_tab =
       browser()->tab_strip_model()->GetWebContentsAt(1);
   ASSERT_NE(history_url, second_tab->GetURL());
 }