OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 browser(), extension_url, WindowOpenDisposition::NEW_FOREGROUND_TAB, | 435 browser(), extension_url, WindowOpenDisposition::NEW_FOREGROUND_TAB, |
436 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 436 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
437 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size()); | 437 EXPECT_EQ(1u, pm->GetRenderFrameHostsForExtension(extension->id()).size()); |
438 } | 438 } |
439 | 439 |
440 // Tests whether frames are correctly classified. Non-extension frames should | 440 // Tests whether frames are correctly classified. Non-extension frames should |
441 // never appear in the list. Top-level extension frames should always appear. | 441 // never appear in the list. Top-level extension frames should always appear. |
442 // Child extension frames should only appear if it is hosted in an extension | 442 // Child extension frames should only appear if it is hosted in an extension |
443 // process (i.e. if the top-level frame is an extension page, or if OOP frames | 443 // process (i.e. if the top-level frame is an extension page, or if OOP frames |
444 // are enabled for extensions). | 444 // are enabled for extensions). |
445 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, FrameClassification) { | 445 // Disabled due to flake: https://crbug.com/693287. |
| 446 IN_PROC_BROWSER_TEST_F(ProcessManagerBrowserTest, |
| 447 DISABLED_FrameClassification) { |
446 const Extension* extension1 = CreateExtension("Extension 1", false); | 448 const Extension* extension1 = CreateExtension("Extension 1", false); |
447 const Extension* extension2 = CreateExtension("Extension 2", true); | 449 const Extension* extension2 = CreateExtension("Extension 2", true); |
448 embedded_test_server()->ServeFilesFromDirectory(extension1->path()); | 450 embedded_test_server()->ServeFilesFromDirectory(extension1->path()); |
449 ASSERT_TRUE(embedded_test_server()->Start()); | 451 ASSERT_TRUE(embedded_test_server()->Start()); |
450 | 452 |
451 const GURL kExt1TwoFramesUrl(extension1->url().Resolve("two_iframes.html")); | 453 const GURL kExt1TwoFramesUrl(extension1->url().Resolve("two_iframes.html")); |
452 const GURL kExt1EmptyUrl(extension1->url().Resolve("empty.html")); | 454 const GURL kExt1EmptyUrl(extension1->url().Resolve("empty.html")); |
453 const GURL kExt2TwoFramesUrl(extension2->url().Resolve("two_iframes.html")); | 455 const GURL kExt2TwoFramesUrl(extension2->url().Resolve("two_iframes.html")); |
454 const GURL kExt2EmptyUrl(extension2->url().Resolve("empty.html")); | 456 const GURL kExt2EmptyUrl(extension2->url().Resolve("empty.html")); |
455 | 457 |
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1163 EXPECT_TRUE(ExecuteScriptAndExtractBool( | 1165 EXPECT_TRUE(ExecuteScriptAndExtractBool( |
1164 popup, "window.domAutomationController.send(!!window.opener)", | 1166 popup, "window.domAutomationController.send(!!window.opener)", |
1165 &is_opener_defined)); | 1167 &is_opener_defined)); |
1166 EXPECT_TRUE(is_opener_defined); | 1168 EXPECT_TRUE(is_opener_defined); |
1167 | 1169 |
1168 // Verify that postMessage to window.opener works. | 1170 // Verify that postMessage to window.opener works. |
1169 VerifyPostMessageToOpener(popup->GetMainFrame(), extension_frame); | 1171 VerifyPostMessageToOpener(popup->GetMainFrame(), extension_frame); |
1170 } | 1172 } |
1171 | 1173 |
1172 } // namespace extensions | 1174 } // namespace extensions |
OLD | NEW |