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_impl.h" | 8 #include "content/browser/renderer_host/render_view_host_impl.h" |
9 #include "content/browser/renderer_host/test_render_view_host.h" | 9 #include "content/browser/renderer_host/test_render_view_host.h" |
10 #include "content/browser/site_instance_impl.h" | 10 #include "content/browser/site_instance_impl.h" |
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 } | 214 } |
215 | 215 |
216 void set_delegate(Delegate* delegate) { | 216 void set_delegate(Delegate* delegate) { |
217 delegate_ = delegate; | 217 delegate_ = delegate; |
218 } | 218 } |
219 | 219 |
220 protected: | 220 protected: |
221 virtual content::RenderViewHost* CreateRenderViewHost() OVERRIDE { | 221 virtual content::RenderViewHost* CreateRenderViewHost() OVERRIDE { |
222 return new TestRenderViewHost( | 222 return new TestRenderViewHost( |
223 SiteInstance::Create(web_contents()->GetBrowserContext()), | 223 SiteInstance::Create(web_contents()->GetBrowserContext()), |
224 this, MSG_ROUTING_NONE); | 224 this, MSG_ROUTING_NONE, false); |
225 } | 225 } |
226 | 226 |
227 virtual content::WebContentsView* CreateWebContentsView() OVERRIDE { | 227 virtual content::WebContentsView* CreateWebContentsView() OVERRIDE { |
228 return NULL; | 228 return NULL; |
229 } | 229 } |
230 | 230 |
231 private: | 231 private: |
232 InterstitialState* state_; | 232 InterstitialState* state_; |
233 bool* deleted_; | 233 bool* deleted_; |
234 int command_received_count_; | 234 int command_received_count_; |
(...skipping 1698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1933 // It should have a transient entry. | 1933 // It should have a transient entry. |
1934 EXPECT_TRUE(other_controller.GetTransientEntry()); | 1934 EXPECT_TRUE(other_controller.GetTransientEntry()); |
1935 | 1935 |
1936 // And the interstitial should be showing. | 1936 // And the interstitial should be showing. |
1937 EXPECT_TRUE(other_contents->ShowingInterstitialPage()); | 1937 EXPECT_TRUE(other_contents->ShowingInterstitialPage()); |
1938 | 1938 |
1939 // And the interstitial should do a reload on don't proceed. | 1939 // And the interstitial should do a reload on don't proceed. |
1940 EXPECT_TRUE(static_cast<InterstitialPageImpl*>( | 1940 EXPECT_TRUE(static_cast<InterstitialPageImpl*>( |
1941 other_contents->GetInterstitialPage())->reload_on_dont_proceed()); | 1941 other_contents->GetInterstitialPage())->reload_on_dont_proceed()); |
1942 } | 1942 } |
OLD | NEW |