Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/browser/guest_view/web_view/web_view_apitest.h" | 5 #include "extensions/browser/guest_view/web_view/web_view_apitest.h" |
| 6 | 6 |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "content/public/browser/render_process_host.h" | 10 #include "content/public/browser/render_process_host.h" |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 } | 209 } |
| 210 | 210 |
| 211 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestDestroyOnEventListener) { | 211 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestDestroyOnEventListener) { |
| 212 RunTest("testDestroyOnEventListener", "web_view/apitest"); | 212 RunTest("testDestroyOnEventListener", "web_view/apitest"); |
| 213 } | 213 } |
| 214 | 214 |
| 215 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestDisplayNoneWebviewLoad) { | 215 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestDisplayNoneWebviewLoad) { |
| 216 RunTest("testDisplayNoneWebviewLoad", "web_view/apitest"); | 216 RunTest("testDisplayNoneWebviewLoad", "web_view/apitest"); |
| 217 } | 217 } |
| 218 | 218 |
| 219 // TODO(lfg): Re-enable this test once the fix for webview leaking | 219 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestDisplayNoneWebviewRemoveChild) { |
| 220 // RenderProcessHost has landed. See http://crbug.com/419020 . | |
| 221 IN_PROC_BROWSER_TEST_F(WebViewAPITest, | |
| 222 DISABLED_TestDisplayNoneWebviewRemoveChild) { | |
| 223 RunTest("testDisplayNoneWebviewRemoveChild", "web_view/apitest"); | 220 RunTest("testDisplayNoneWebviewRemoveChild", "web_view/apitest"); |
| 224 } | 221 } |
| 225 | 222 |
| 226 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestEventName) { | 223 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestEventName) { |
| 227 RunTest("testEventName", "web_view/apitest"); | 224 RunTest("testEventName", "web_view/apitest"); |
| 228 } | 225 } |
| 229 | 226 |
| 230 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestExecuteScript) { | 227 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestExecuteScript) { |
| 231 RunTest("testExecuteScript", "web_view/apitest"); | 228 RunTest("testExecuteScript", "web_view/apitest"); |
| 232 } | 229 } |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 402 } | 399 } |
| 403 | 400 |
| 404 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestReloadAfterTerminate) { | 401 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestReloadAfterTerminate) { |
| 405 RunTest("testReloadAfterTerminate", "web_view/apitest"); | 402 RunTest("testReloadAfterTerminate", "web_view/apitest"); |
| 406 } | 403 } |
| 407 | 404 |
| 408 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestRemoveSrcAttribute) { | 405 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestRemoveSrcAttribute) { |
| 409 RunTest("testRemoveSrcAttribute", "web_view/apitest"); | 406 RunTest("testRemoveSrcAttribute", "web_view/apitest"); |
| 410 } | 407 } |
| 411 | 408 |
| 412 // TODO(lfg): Re-enable this test once the fix for webview leaking | 409 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestRemoveWebviewAfterNavigation) { |
| 413 // RenderProcessHost has landed. See http://crbug.com/419020 . | |
| 414 IN_PROC_BROWSER_TEST_F(WebViewAPITest, | |
| 415 DISABLED_TestRemoveWebviewAfterNavigation) { | |
| 416 RunTest("testRemoveWebviewAfterNavigation", "web_view/apitest"); | 410 RunTest("testRemoveWebviewAfterNavigation", "web_view/apitest"); |
| 411 GetGuestViewManager()->WaitForGuestDeleted(); | |
|
Fady Samuel
2014/10/03 20:51:36
Can we move this to the bottom of RunTest?
Fady Samuel
2014/10/03 20:59:28
LGTM. I like the idea of observing that every gues
| |
| 417 } | 412 } |
| 418 | 413 |
| 419 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestResizeWebviewResizesContent) { | 414 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestResizeWebviewResizesContent) { |
| 420 RunTest("testResizeWebviewResizesContent", "web_view/apitest"); | 415 RunTest("testResizeWebviewResizesContent", "web_view/apitest"); |
| 421 } | 416 } |
| 422 | 417 |
| 423 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestTerminateAfterExit) { | 418 IN_PROC_BROWSER_TEST_F(WebViewAPITest, TestTerminateAfterExit) { |
| 424 RunTest("testTerminateAfterExit", "web_view/apitest"); | 419 RunTest("testTerminateAfterExit", "web_view/apitest"); |
| 425 } | 420 } |
| 426 | 421 |
| 427 } // namespace extensions | 422 } // namespace extensions |
| OLD | NEW |