| OLD | NEW |
| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/cancelable_callback.h" | 10 #include "base/cancelable_callback.h" |
| (...skipping 1476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1487 | 1487 |
| 1488 private: | 1488 private: |
| 1489 std::string source_; | 1489 std::string source_; |
| 1490 std::string content_; | 1490 std::string content_; |
| 1491 DISALLOW_COPY_AND_ASSIGN(MockWebUIProvider); | 1491 DISALLOW_COPY_AND_ASSIGN(MockWebUIProvider); |
| 1492 }; | 1492 }; |
| 1493 | 1493 |
| 1494 // This tests checks that window is correctly initialized when DevTools is | 1494 // This tests checks that window is correctly initialized when DevTools is |
| 1495 // opened while navigation through history with forward and back actions. | 1495 // opened while navigation through history with forward and back actions. |
| 1496 // (crbug.com/627407) | 1496 // (crbug.com/627407) |
| 1497 // Flaky on Windows. http://crbug.com/628174#c4 | 1497 // Flaky on Windows and ChromeOS. http://crbug.com/628174#c4 |
| 1498 #if defined(OS_WIN) | |
| 1499 #define MAYBE_TestWindowInitializedOnNavigateBack \ | |
| 1500 DISABLED_TestWindowInitializedOnNavigateBack | |
| 1501 #else | |
| 1502 #define MAYBE_TestWindowInitializedOnNavigateBack \ | |
| 1503 TestWindowInitializedOnNavigateBack | |
| 1504 #endif | |
| 1505 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, | 1498 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, |
| 1506 MAYBE_TestWindowInitializedOnNavigateBack) { | 1499 DISABLED_TestWindowInitializedOnNavigateBack) { |
| 1507 TestChromeWebUIControllerFactory test_factory; | 1500 TestChromeWebUIControllerFactory test_factory; |
| 1508 MockWebUIProvider mock_provider("dummyurl", | 1501 MockWebUIProvider mock_provider("dummyurl", |
| 1509 "<script>\n" | 1502 "<script>\n" |
| 1510 " window.abc = 239;\n" | 1503 " window.abc = 239;\n" |
| 1511 " console.log(abc);\n" | 1504 " console.log(abc);\n" |
| 1512 "</script>"); | 1505 "</script>"); |
| 1513 test_factory.AddFactoryOverride(GURL("chrome://dummyurl").host(), | 1506 test_factory.AddFactoryOverride(GURL("chrome://dummyurl").host(), |
| 1514 &mock_provider); | 1507 &mock_provider); |
| 1515 content::WebUIControllerFactory::RegisterFactory(&test_factory); | 1508 content::WebUIControllerFactory::RegisterFactory(&test_factory); |
| 1516 | 1509 |
| 1517 ui_test_utils::NavigateToURL(browser(), GURL("chrome://dummyurl")); | 1510 ui_test_utils::NavigateToURL(browser(), GURL("chrome://dummyurl")); |
| 1518 DevToolsWindow* window = | 1511 DevToolsWindow* window = |
| 1519 DevToolsWindowTesting::OpenDevToolsWindowSync(GetInspectedTab(), true); | 1512 DevToolsWindowTesting::OpenDevToolsWindowSync(GetInspectedTab(), true); |
| 1520 chrome::DuplicateTab(browser()); | 1513 chrome::DuplicateTab(browser()); |
| 1521 chrome::SelectPreviousTab(browser()); | 1514 chrome::SelectPreviousTab(browser()); |
| 1522 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 1515 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
| 1523 chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB); | 1516 chrome::GoBack(browser(), WindowOpenDisposition::CURRENT_TAB); |
| 1524 RunTestFunction(window, "testWindowInitializedOnNavigateBack"); | 1517 RunTestFunction(window, "testWindowInitializedOnNavigateBack"); |
| 1525 | 1518 |
| 1526 DevToolsWindowTesting::CloseDevToolsWindowSync(window); | 1519 DevToolsWindowTesting::CloseDevToolsWindowSync(window); |
| 1527 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); | 1520 content::WebUIControllerFactory::UnregisterFactoryForTesting(&test_factory); |
| 1528 } | 1521 } |
| 1529 | 1522 |
| 1530 // Tests scripts panel showing. | 1523 // Tests scripts panel showing. |
| 1531 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsSharedWorker) { | 1524 IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestDevToolsSharedWorker) { |
| 1532 RunTest("testDevToolsSharedWorker", url::kAboutBlankURL); | 1525 RunTest("testDevToolsSharedWorker", url::kAboutBlankURL); |
| 1533 } | 1526 } |
| 1534 | 1527 |
| OLD | NEW |