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

Side by Side Diff: chrome/browser/ssl/ssl_browser_tests.cc

Issue 2542463002: Do not try to convert point to root coordinate space when |local_frame_id_| is invalid. (Closed)
Patch Set: Created 4 years 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 | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | 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 <utility> 5 #include <utility>
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 2332 matching lines...) Expand 10 before | Expand all | Expand 10 after
2343 observer.Wait(); 2343 observer.Wait();
2344 2344
2345 // We should still be authentication broken. 2345 // We should still be authentication broken.
2346 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, 2346 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID,
2347 AuthState::NONE); 2347 AuthState::NONE);
2348 } 2348 }
2349 2349
2350 // From an HTTP top frame, navigate to good and bad HTTPS (security state should 2350 // From an HTTP top frame, navigate to good and bad HTTPS (security state should
2351 // stay unauthenticated). 2351 // stay unauthenticated).
2352 IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnauthenticatedFrameNavigation) { 2352 IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnauthenticatedFrameNavigation) {
2353 // TODO(crbug.com/668913): Flaky with --site-per-process.
2354 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
2355 switches::kSitePerProcess)) {
2356 return;
2357 }
2358 ASSERT_TRUE(embedded_test_server()->Start()); 2353 ASSERT_TRUE(embedded_test_server()->Start());
2359 ASSERT_TRUE(https_server_.Start()); 2354 ASSERT_TRUE(https_server_.Start());
2360 ASSERT_TRUE(https_server_expired_.Start()); 2355 ASSERT_TRUE(https_server_expired_.Start());
2361 2356
2362 std::string top_frame_path; 2357 std::string top_frame_path;
2363 GetTopFramePath(*embedded_test_server(), https_server_, https_server_expired_, 2358 GetTopFramePath(*embedded_test_server(), https_server_, https_server_expired_,
2364 &top_frame_path); 2359 &top_frame_path);
2365 2360
2366 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); 2361 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
2367 ui_test_utils::NavigateToURL(browser(), 2362 ui_test_utils::NavigateToURL(browser(),
(...skipping 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after
3882 3877
3883 // Visit a page over https that contains a frame with a redirect. 3878 // Visit a page over https that contains a frame with a redirect.
3884 3879
3885 // XMLHttpRequest insecure content in synchronous mode. 3880 // XMLHttpRequest insecure content in synchronous mode.
3886 3881
3887 // XMLHttpRequest insecure content in asynchronous mode. 3882 // XMLHttpRequest insecure content in asynchronous mode.
3888 3883
3889 // XMLHttpRequest over bad ssl in synchronous mode. 3884 // XMLHttpRequest over bad ssl in synchronous mode.
3890 3885
3891 // XMLHttpRequest over OK ssl in synchronous mode. 3886 // XMLHttpRequest over OK ssl in synchronous mode.
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_widget_host_view_child_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698