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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_ui_browsertest.cc

Issue 2681413002: MD Settings: Disable MdSettingsUITest.ViewSourceDoesntCrash when Vulcanized. (Closed)
Patch Set: Created 3 years, 10 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <string> 5 #include <string>
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_commands.h" 8 #include "chrome/browser/ui/browser_commands.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/common/url_constants.h" 10 #include "chrome/common/url_constants.h"
11 #include "chrome/test/base/in_process_browser_test.h" 11 #include "chrome/test/base/in_process_browser_test.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/browser/web_ui.h" 14 #include "content/public/browser/web_ui.h"
15 #include "content/public/browser/web_ui_message_handler.h" 15 #include "content/public/browser/web_ui_message_handler.h"
16 #include "content/public/common/url_constants.h" 16 #include "content/public/common/url_constants.h"
17 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
18 #include "ui/base/window_open_disposition.h" 18 #include "ui/base/window_open_disposition.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 typedef InProcessBrowserTest MdSettingsUITest; 21 typedef InProcessBrowserTest MdSettingsUITest;
22 22
23 using ui_test_utils::NavigateToURL; 23 using ui_test_utils::NavigateToURL;
24 using content::WaitForLoadStop; 24 using content::WaitForLoadStop;
25 25
26 // When using Vulcanize, this test times out, probably because the HTML and JS
27 // bundled files are too large.
28 #if !BUILDFLAG(USE_VULCANIZE)
26 IN_PROC_BROWSER_TEST_F(MdSettingsUITest, ViewSourceDoesntCrash) { 29 IN_PROC_BROWSER_TEST_F(MdSettingsUITest, ViewSourceDoesntCrash) {
27 NavigateToURL(browser(), 30 NavigateToURL(browser(),
28 GURL(content::kViewSourceScheme + std::string(":") + 31 GURL(content::kViewSourceScheme + std::string(":") +
29 chrome::kChromeUIMdSettingsURL)); 32 chrome::kChromeUIMdSettingsURL));
Dan Beam 2017/02/09 20:32:56 fwiw: you could also just try to load something sm
dpapad 2017/02/09 23:41:25 Done.
30 } 33 }
34 #endif
31 35
32 // May not complete on memory and Windows debug bots. TODO(dbeam): investigate 36 // May not complete on memory and Windows debug bots. TODO(dbeam): investigate
33 // and fix. See https://crbug.com/558434, https://crbug.com/620370 and 37 // and fix. See https://crbug.com/558434, https://crbug.com/620370 and
34 // https://crbug.com/651296. 38 // https://crbug.com/651296.
35 #if defined(MEMORY_SANITIZER) || defined(OS_WIN) || defined(OS_CHROMEOS) 39 #if defined(MEMORY_SANITIZER) || defined(OS_WIN) || defined(OS_CHROMEOS)
36 #define MAYBE_BackForwardDoesntCrash DISABLED_BackForwardDoesntCrash 40 #define MAYBE_BackForwardDoesntCrash DISABLED_BackForwardDoesntCrash
37 #else 41 #else
38 #define MAYBE_BackForwardDoesntCrash BackForwardDoesntCrash 42 #define MAYBE_BackForwardDoesntCrash BackForwardDoesntCrash
39 #endif 43 #endif
40 44
(...skipping 17 matching lines...) Expand all
58 ->GetWebUI() 62 ->GetWebUI()
59 ->GetHandlersForTesting(); 63 ->GetHandlersForTesting();
60 64
61 for (const std::unique_ptr<content::WebUIMessageHandler>& handler : 65 for (const std::unique_ptr<content::WebUIMessageHandler>& handler :
62 handlers) { 66 handlers) {
63 handler->AllowJavascriptForTesting(); 67 handler->AllowJavascriptForTesting();
64 handler->DisallowJavascript(); 68 handler->DisallowJavascript();
65 handler->AllowJavascriptForTesting(); 69 handler->AllowJavascriptForTesting();
66 } 70 }
67 } 71 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698