| OLD | NEW |
| 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" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 IN_PROC_BROWSER_TEST_F(MdSettingsUITest, ViewSourceDoesntCrash) { | 26 IN_PROC_BROWSER_TEST_F(MdSettingsUITest, ViewSourceDoesntCrash) { |
| 27 NavigateToURL(browser(), | 27 NavigateToURL(browser(), |
| 28 GURL(content::kViewSourceScheme + std::string(":") + | 28 GURL(content::kViewSourceScheme + std::string(":") + |
| 29 chrome::kChromeUIMdSettingsURL)); | 29 chrome::kChromeUIMdSettingsURL)); |
| 30 } | 30 } |
| 31 | 31 |
| 32 // May not complete on memory and Windows debug bots. TODO(dbeam): investigate | 32 // 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 | 33 // and fix. See https://crbug.com/558434, https://crbug.com/620370 and |
| 34 // https://crbug.com/651296. | 34 // https://crbug.com/651296. |
| 35 #if defined(MEMORY_SANITIZER) || defined(OS_WIN) | 35 #if defined(MEMORY_SANITIZER) || defined(OS_WIN) || defined(OS_CHROMEOS) |
| 36 #define MAYBE_BackForwardDoesntCrash DISABLED_BackForwardDoesntCrash | 36 #define MAYBE_BackForwardDoesntCrash DISABLED_BackForwardDoesntCrash |
| 37 #else | 37 #else |
| 38 #define MAYBE_BackForwardDoesntCrash BackForwardDoesntCrash | 38 #define MAYBE_BackForwardDoesntCrash BackForwardDoesntCrash |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 IN_PROC_BROWSER_TEST_F(MdSettingsUITest, MAYBE_BackForwardDoesntCrash) { | 41 IN_PROC_BROWSER_TEST_F(MdSettingsUITest, MAYBE_BackForwardDoesntCrash) { |
| 42 NavigateToURL(browser(), GURL(chrome::kChromeUIMdSettingsURL)); | 42 NavigateToURL(browser(), GURL(chrome::kChromeUIMdSettingsURL)); |
| 43 | 43 |
| 44 NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL)); | 44 NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL)); |
| 45 | 45 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 57 ->GetActiveWebContents() | 57 ->GetActiveWebContents() |
| 58 ->GetWebUI() | 58 ->GetWebUI() |
| 59 ->GetHandlersForTesting(); | 59 ->GetHandlersForTesting(); |
| 60 | 60 |
| 61 for (content::WebUIMessageHandler* handler : handlers) { | 61 for (content::WebUIMessageHandler* handler : handlers) { |
| 62 handler->AllowJavascriptForTesting(); | 62 handler->AllowJavascriptForTesting(); |
| 63 handler->DisallowJavascript(); | 63 handler->DisallowJavascript(); |
| 64 handler->AllowJavascriptForTesting(); | 64 handler->AllowJavascriptForTesting(); |
| 65 } | 65 } |
| 66 } | 66 } |
| OLD | NEW |