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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/stringprintf.h" | 6 #include "base/stringprintf.h" |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "content/browser/web_contents/web_contents_impl.h" | 8 #include "content/browser/web_contents/web_contents_impl.h" |
9 #include "content/public/browser/notification_observer.h" | 9 #include "content/public/browser/notification_observer.h" |
10 #include "content/public/browser/notification_service.h" | 10 #include "content/public/browser/notification_service.h" |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 iframe_id.c_str(), url.spec().c_str()); | 150 iframe_id.c_str(), url.spec().c_str()); |
151 WindowedNotificationObserver load_observer( | 151 WindowedNotificationObserver load_observer( |
152 NOTIFICATION_LOAD_STOP, | 152 NOTIFICATION_LOAD_STOP, |
153 Source<NavigationController>( | 153 Source<NavigationController>( |
154 &shell()->web_contents()->GetController())); | 154 &shell()->web_contents()->GetController())); |
155 bool result = ExecuteScript(window->web_contents(), script); | 155 bool result = ExecuteScript(window->web_contents(), script); |
156 load_observer.Wait(); | 156 load_observer.Wait(); |
157 return result; | 157 return result; |
158 } | 158 } |
159 | 159 |
160 void SetUpCommandLine(CommandLine* command_line) { | 160 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
161 command_line->AppendSwitch(switches::kSitePerProcess); | 161 command_line->AppendSwitch(switches::kSitePerProcess); |
162 } | 162 } |
163 }; | 163 }; |
164 | 164 |
165 // TODO(nasko): Disable this test until out-of-process iframes is ready and the | 165 // TODO(nasko): Disable this test until out-of-process iframes is ready and the |
166 // security checks are back in place. | 166 // security checks are back in place. |
167 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DISABLED_CrossSiteIframe) { | 167 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, DISABLED_CrossSiteIframe) { |
168 ASSERT_TRUE(test_server()->Start()); | 168 ASSERT_TRUE(test_server()->Start()); |
169 net::TestServer https_server( | 169 net::TestServer https_server( |
170 net::TestServer::TYPE_HTTPS, | 170 net::TestServer::TYPE_HTTPS, |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 "server-redirect?" + client_redirect_http_url.spec())); | 393 "server-redirect?" + client_redirect_http_url.spec())); |
394 EXPECT_TRUE(NavigateIframeToURL(shell(), server_redirect_http_url, "test")); | 394 EXPECT_TRUE(NavigateIframeToURL(shell(), server_redirect_http_url, "test")); |
395 | 395 |
396 // DidFailProvisionalLoad when navigating to client_redirect_http_url. | 396 // DidFailProvisionalLoad when navigating to client_redirect_http_url. |
397 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); | 397 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); |
398 EXPECT_FALSE(observer.navigation_succeeded()); | 398 EXPECT_FALSE(observer.navigation_succeeded()); |
399 } | 399 } |
400 } | 400 } |
401 | 401 |
402 } | 402 } |
OLD | NEW |