| 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 "base/strings/string_number_conversions.h" | 5 #include "base/strings/string_number_conversions.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
| 8 #include "net/dns/mock_host_resolver.h" | 8 #include "net/dns/mock_host_resolver.h" |
| 9 | 9 |
| 10 class ExecuteScriptApiTest : public ExtensionApiTest { | 10 class ExecuteScriptApiTest : public ExtensionApiTest { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, SynchronousRemoval) { | 128 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, SynchronousRemoval) { |
| 129 ASSERT_TRUE(RunSubtest("synchronous")) << message_; | 129 ASSERT_TRUE(RunSubtest("synchronous")) << message_; |
| 130 } | 130 } |
| 131 | 131 |
| 132 // Removes the frame at the frame's first scheduled microtask. | 132 // Removes the frame at the frame's first scheduled microtask. |
| 133 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, MicrotaskRemoval) { | 133 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, MicrotaskRemoval) { |
| 134 ASSERT_TRUE(RunSubtest("microtask")) << message_; | 134 ASSERT_TRUE(RunSubtest("microtask")) << message_; |
| 135 } | 135 } |
| 136 | 136 |
| 137 // Removes the frame at the frame's first scheduled macrotask. | 137 // Removes the frame at the frame's first scheduled macrotask. |
| 138 // Test is flaky. crbug.com/722703 | 138 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, MacrotaskRemoval) { |
| 139 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, DISABLED_MacrotaskRemoval) { | |
| 140 ASSERT_TRUE(RunSubtest("macrotask")) << message_; | 139 ASSERT_TRUE(RunSubtest("macrotask")) << message_; |
| 141 } | 140 } |
| 142 | 141 |
| 143 // Removes the frame at the first DOMNodeInserted event. | 142 // Removes the frame at the first DOMNodeInserted event. |
| 144 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, DOMNodeInserted1) { | 143 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, DOMNodeInserted1) { |
| 145 ASSERT_TRUE(RunSubtest("domnodeinserted1")) << message_; | 144 ASSERT_TRUE(RunSubtest("domnodeinserted1")) << message_; |
| 146 } | 145 } |
| 147 | 146 |
| 148 // Removes the frame at the second DOMNodeInserted event. | 147 // Removes the frame at the second DOMNodeInserted event. |
| 149 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, DOMNodeInserted2) { | 148 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, DOMNodeInserted2) { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 166 } | 165 } |
| 167 | 166 |
| 168 // Removes the frame at the third DOMSubtreeModified event. | 167 // Removes the frame at the third DOMSubtreeModified event. |
| 169 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, DOMSubtreeModified3) { | 168 IN_PROC_BROWSER_TEST_P(DestructiveScriptTest, DOMSubtreeModified3) { |
| 170 ASSERT_TRUE(RunSubtest("domsubtreemodified3")) << message_; | 169 ASSERT_TRUE(RunSubtest("domsubtreemodified3")) << message_; |
| 171 } | 170 } |
| 172 | 171 |
| 173 INSTANTIATE_TEST_CASE_P(ExecuteScriptApiTest, | 172 INSTANTIATE_TEST_CASE_P(ExecuteScriptApiTest, |
| 174 DestructiveScriptTest, | 173 DestructiveScriptTest, |
| 175 ::testing::Range(0, kDestructiveScriptTestBucketCount)); | 174 ::testing::Range(0, kDestructiveScriptTestBucketCount)); |
| OLD | NEW |