Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Side by Side Diff: content/browser/site_per_process_browsertest.cc

Issue 1969623002: Disabled flaky test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "content/browser/site_per_process_browsertest.h" 5 #include "content/browser/site_per_process_browsertest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 3068 matching lines...) Expand 10 before | Expand all | Expand 10 after
3079 // A A A 3079 // A A A
3080 // / / \ / \ . 3080 // / / \ / \ .
3081 // B -> B A -> B A 3081 // B -> B A -> B A
3082 // \ . 3082 // \ .
3083 // B 3083 // B
3084 // 3084 //
3085 // The test checks sandbox flags and origin for the proxy added in step 2, by 3085 // The test checks sandbox flags and origin for the proxy added in step 2, by
3086 // checking whether the grandchild frame added in step 3 sees proper sandbox 3086 // checking whether the grandchild frame added in step 3 sees proper sandbox
3087 // flags and origin for its (remote) parent. This wasn't addressed when 3087 // flags and origin for its (remote) parent. This wasn't addressed when
3088 // https://crbug.com/423587 was fixed. 3088 // https://crbug.com/423587 was fixed.
3089 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, 3089 // TODO(alexmos): Re-enable when https://crbug.com/610893 is fixed.
3090 ProxiesForNewChildFramesHaveCorrectReplicationState) { 3090 IN_PROC_BROWSER_TEST_F(
3091 SitePerProcessBrowserTest,
3092 DISABLED_ProxiesForNewChildFramesHaveCorrectReplicationState) {
3091 GURL main_url( 3093 GURL main_url(
3092 embedded_test_server()->GetURL("/frame_tree/page_with_one_frame.html")); 3094 embedded_test_server()->GetURL("/frame_tree/page_with_one_frame.html"));
3093 EXPECT_TRUE(NavigateToURL(shell(), main_url)); 3095 EXPECT_TRUE(NavigateToURL(shell(), main_url));
3094 3096
3095 // It is safe to obtain the root frame tree node here, as it doesn't change. 3097 // It is safe to obtain the root frame tree node here, as it doesn't change.
3096 FrameTreeNode* root = web_contents()->GetFrameTree()->root(); 3098 FrameTreeNode* root = web_contents()->GetFrameTree()->root();
3097 TestNavigationObserver observer(shell()->web_contents()); 3099 TestNavigationObserver observer(shell()->web_contents());
3098 3100
3099 EXPECT_EQ( 3101 EXPECT_EQ(
3100 " Site A ------------ proxies for B\n" 3102 " Site A ------------ proxies for B\n"
(...skipping 3379 matching lines...) Expand 10 before | Expand all | Expand 10 after
6480 // Go back and ensure the about:blank URL committed in the same SiteInstance 6482 // Go back and ensure the about:blank URL committed in the same SiteInstance
6481 // as the original navigation. 6483 // as the original navigation.
6482 EXPECT_TRUE(web_contents()->GetController().CanGoBack()); 6484 EXPECT_TRUE(web_contents()->GetController().CanGoBack());
6483 TestFrameNavigationObserver frame_observer(child); 6485 TestFrameNavigationObserver frame_observer(child);
6484 web_contents()->GetController().GoBack(); 6486 web_contents()->GetController().GoBack();
6485 frame_observer.WaitForCommit(); 6487 frame_observer.WaitForCommit();
6486 EXPECT_EQ(orig_site_instance, child->current_frame_host()->GetSiteInstance()); 6488 EXPECT_EQ(orig_site_instance, child->current_frame_host()->GetSiteInstance());
6487 } 6489 }
6488 6490
6489 } // namespace content 6491 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698