| 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/logging.h" | 5 #include "base/logging.h" |
| 6 #include "base/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "content/browser/mock_content_browser_client.h" | 7 #include "content/browser/mock_content_browser_client.h" |
| 8 #include "content/browser/renderer_host/render_view_host.h" | 8 #include "content/browser/renderer_host/render_view_host.h" |
| 9 #include "content/browser/renderer_host/render_widget_host_view.h" | 9 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 10 #include "content/browser/renderer_host/test_render_view_host.h" | 10 #include "content/browser/renderer_host/test_render_view_host.h" |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 ViewHostMsg_FrameNavigate_Params params; | 175 ViewHostMsg_FrameNavigate_Params params; |
| 176 InitNavigateParams(¶ms, page_id, url, content::PAGE_TRANSITION_TYPED); | 176 InitNavigateParams(¶ms, page_id, url, content::PAGE_TRANSITION_TYPED); |
| 177 DidNavigate(GetRenderViewHostForTesting(), params); | 177 DidNavigate(GetRenderViewHostForTesting(), params); |
| 178 } | 178 } |
| 179 | 179 |
| 180 void TestRenderViewGone(base::TerminationStatus status, int error_code) { | 180 void TestRenderViewGone(base::TerminationStatus status, int error_code) { |
| 181 RenderViewGone(GetRenderViewHostForTesting(), status, error_code); | 181 RenderViewGone(GetRenderViewHostForTesting(), status, error_code); |
| 182 } | 182 } |
| 183 | 183 |
| 184 bool is_showing() const { | 184 bool is_showing() const { |
| 185 return static_cast<TestRenderWidgetHostView*>( | 185 return static_cast<content::TestRenderWidgetHostView*>( |
| 186 GetRenderViewHostForTesting()->view())->is_showing(); | 186 GetRenderViewHostForTesting()->view())->is_showing(); |
| 187 } | 187 } |
| 188 | 188 |
| 189 void ClearStates() { | 189 void ClearStates() { |
| 190 state_ = NULL; | 190 state_ = NULL; |
| 191 deleted_ = NULL; | 191 deleted_ = NULL; |
| 192 delegate_ = NULL; | 192 delegate_ = NULL; |
| 193 } | 193 } |
| 194 | 194 |
| 195 void CommandReceived() { | 195 void CommandReceived() { |
| (...skipping 1692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1888 // It should have a transient entry. | 1888 // It should have a transient entry. |
| 1889 EXPECT_TRUE(other_controller.GetTransientEntry()); | 1889 EXPECT_TRUE(other_controller.GetTransientEntry()); |
| 1890 | 1890 |
| 1891 // And the interstitial should be showing. | 1891 // And the interstitial should be showing. |
| 1892 EXPECT_TRUE(other_contents->ShowingInterstitialPage()); | 1892 EXPECT_TRUE(other_contents->ShowingInterstitialPage()); |
| 1893 | 1893 |
| 1894 // And the interstitial should do a reload on don't proceed. | 1894 // And the interstitial should do a reload on don't proceed. |
| 1895 EXPECT_TRUE(static_cast<InterstitialPageImpl*>( | 1895 EXPECT_TRUE(static_cast<InterstitialPageImpl*>( |
| 1896 other_contents->GetInterstitialPage())->reload_on_dont_proceed()); | 1896 other_contents->GetInterstitialPage())->reload_on_dont_proceed()); |
| 1897 } | 1897 } |
| OLD | NEW |