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

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

Issue 479403004: Re-enable SitePerProcessBrowserTest.CrossSiteIframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ah, stupid me! Created 6 years, 4 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 | Annotate | Revision Log
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "content/browser/frame_host/cross_process_frame_connector.h" 7 #include "content/browser/frame_host/cross_process_frame_connector.h"
8 #include "content/browser/frame_host/frame_tree.h" 8 #include "content/browser/frame_host/frame_tree.h"
9 #include "content/browser/frame_host/render_frame_proxy_host.h" 9 #include "content/browser/frame_host/render_frame_proxy_host.h"
10 #include "content/browser/frame_host/render_widget_host_view_child_frame.h" 10 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 } 187 }
188 188
189 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 189 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
190 command_line->AppendSwitch(switches::kSitePerProcess); 190 command_line->AppendSwitch(switches::kSitePerProcess);
191 } 191 }
192 }; 192 };
193 193
194 // Ensure that we can complete a cross-process subframe navigation. 194 // Ensure that we can complete a cross-process subframe navigation.
195 // Crashes ChromeOS bot, but the bug is probably present on other platforms 195 // Crashes ChromeOS bot, but the bug is probably present on other platforms
196 // also. http://crbug.com/399775 196 // also. http://crbug.com/399775
197 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DISABLED_CrossSiteIframe) { 197 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframe) {
198 host_resolver()->AddRule("*", "127.0.0.1"); 198 host_resolver()->AddRule("*", "127.0.0.1");
199 ASSERT_TRUE(test_server()->Start()); 199 ASSERT_TRUE(test_server()->Start());
200 GURL main_url(test_server()->GetURL("files/site_per_process_main.html")); 200 GURL main_url(test_server()->GetURL("files/site_per_process_main.html"));
201 NavigateToURL(shell(), main_url); 201 NavigateToURL(shell(), main_url);
202 202
203 // It is safe to obtain the root frame tree node here, as it doesn't change. 203 // It is safe to obtain the root frame tree node here, as it doesn't change.
204 FrameTreeNode* root = 204 FrameTreeNode* root =
205 static_cast<WebContentsImpl*>(shell()->web_contents())-> 205 static_cast<WebContentsImpl*>(shell()->web_contents())->
206 GetFrameTree()->root(); 206 GetFrameTree()->root();
207 207
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 "server-redirect?" + client_redirect_http_url.spec())); 564 "server-redirect?" + client_redirect_http_url.spec()));
565 EXPECT_TRUE(NavigateIframeToURL(shell(), server_redirect_http_url, "test")); 565 EXPECT_TRUE(NavigateIframeToURL(shell(), server_redirect_http_url, "test"));
566 566
567 // DidFailProvisionalLoad when navigating to client_redirect_http_url. 567 // DidFailProvisionalLoad when navigating to client_redirect_http_url.
568 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); 568 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url);
569 EXPECT_FALSE(observer.navigation_succeeded()); 569 EXPECT_FALSE(observer.navigation_succeeded());
570 } 570 }
571 } 571 }
572 572
573 } // namespace content 573 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698