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 "content/browser/site_per_process_browsertest.h" | 5 #include "content/browser/site_per_process_browsertest.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "content/browser/frame_host/cross_process_frame_connector.h" | 9 #include "content/browser/frame_host/cross_process_frame_connector.h" |
10 #include "content/browser/frame_host/frame_tree.h" | 10 #include "content/browser/frame_host/frame_tree.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 const GURL& validated_url, | 46 const GURL& validated_url, |
47 int error_code, | 47 int error_code, |
48 const base::string16& error_description) OVERRIDE { | 48 const base::string16& error_description) OVERRIDE { |
49 navigation_url_ = validated_url; | 49 navigation_url_ = validated_url; |
50 navigation_succeeded_ = false; | 50 navigation_succeeded_ = false; |
51 } | 51 } |
52 | 52 |
53 virtual void DidCommitProvisionalLoadForFrame( | 53 virtual void DidCommitProvisionalLoadForFrame( |
54 RenderFrameHost* render_frame_host, | 54 RenderFrameHost* render_frame_host, |
55 const GURL& url, | 55 const GURL& url, |
56 PageTransition transition_type) OVERRIDE { | 56 ui::PageTransition transition_type) OVERRIDE { |
57 navigation_url_ = url; | 57 navigation_url_ = url; |
58 navigation_succeeded_ = true; | 58 navigation_succeeded_ = true; |
59 } | 59 } |
60 | 60 |
61 const GURL& navigation_url() const { | 61 const GURL& navigation_url() const { |
62 return navigation_url_; | 62 return navigation_url_; |
63 } | 63 } |
64 | 64 |
65 int navigation_succeeded() const { return navigation_succeeded_; } | 65 int navigation_succeeded() const { return navigation_succeeded_; } |
66 | 66 |
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
571 "server-redirect?" + client_redirect_http_url.spec())); | 571 "server-redirect?" + client_redirect_http_url.spec())); |
572 EXPECT_TRUE(NavigateIframeToURL(shell(), server_redirect_http_url, "test")); | 572 EXPECT_TRUE(NavigateIframeToURL(shell(), server_redirect_http_url, "test")); |
573 | 573 |
574 // DidFailProvisionalLoad when navigating to client_redirect_http_url. | 574 // DidFailProvisionalLoad when navigating to client_redirect_http_url. |
575 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); | 575 EXPECT_EQ(observer.navigation_url(), client_redirect_http_url); |
576 EXPECT_FALSE(observer.navigation_succeeded()); | 576 EXPECT_FALSE(observer.navigation_succeeded()); |
577 } | 577 } |
578 } | 578 } |
579 | 579 |
580 } // namespace content | 580 } // namespace content |
OLD | NEW |