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/renderer_host/render_view_host_impl.h" | 7 #include "content/browser/renderer_host/render_view_host_impl.h" |
8 #include "content/browser/renderer_host/test_render_view_host.h" | 8 #include "content/browser/renderer_host/test_render_view_host.h" |
9 #include "content/browser/site_instance_impl.h" | 9 #include "content/browser/site_instance_impl.h" |
10 #include "content/browser/web_contents/interstitial_page_impl.h" | 10 #include "content/browser/web_contents/interstitial_page_impl.h" |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 } | 209 } |
210 | 210 |
211 class TestInterstitialPageStateGuard : public TestInterstitialPage::Delegate { | 211 class TestInterstitialPageStateGuard : public TestInterstitialPage::Delegate { |
212 public: | 212 public: |
213 explicit TestInterstitialPageStateGuard( | 213 explicit TestInterstitialPageStateGuard( |
214 TestInterstitialPage* interstitial_page) | 214 TestInterstitialPage* interstitial_page) |
215 : interstitial_page_(interstitial_page) { | 215 : interstitial_page_(interstitial_page) { |
216 DCHECK(interstitial_page_); | 216 DCHECK(interstitial_page_); |
217 interstitial_page_->set_delegate(this); | 217 interstitial_page_->set_delegate(this); |
218 } | 218 } |
219 ~TestInterstitialPageStateGuard() { | 219 virtual ~TestInterstitialPageStateGuard() { |
220 if (interstitial_page_) | 220 if (interstitial_page_) |
221 interstitial_page_->ClearStates(); | 221 interstitial_page_->ClearStates(); |
222 } | 222 } |
223 | 223 |
224 virtual void TestInterstitialPageDeleted(TestInterstitialPage* interstitial) { | 224 virtual void TestInterstitialPageDeleted( |
| 225 TestInterstitialPage* interstitial) OVERRIDE { |
225 DCHECK(interstitial_page_ == interstitial); | 226 DCHECK(interstitial_page_ == interstitial); |
226 interstitial_page_ = NULL; | 227 interstitial_page_ = NULL; |
227 } | 228 } |
228 | 229 |
229 private: | 230 private: |
230 TestInterstitialPage* interstitial_page_; | 231 TestInterstitialPage* interstitial_page_; |
231 }; | 232 }; |
232 | 233 |
233 class WebContentsImplTest : public RenderViewHostImplTestHarness { | 234 class WebContentsImplTest : public RenderViewHostImplTestHarness { |
234 public: | 235 public: |
(...skipping 1735 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1970 other_contents->NavigateAndCommit(url_normalized); | 1971 other_contents->NavigateAndCommit(url_normalized); |
1971 | 1972 |
1972 // Check that an IPC with about:whatever is correctly normalized. | 1973 // Check that an IPC with about:whatever is correctly normalized. |
1973 other_contents->TestDidFailLoadWithError( | 1974 other_contents->TestDidFailLoadWithError( |
1974 1, url_from_ipc, true, 1, string16()); | 1975 1, url_from_ipc, true, 1, string16()); |
1975 EXPECT_EQ(url_normalized, other_observer.last_url()); | 1976 EXPECT_EQ(url_normalized, other_observer.last_url()); |
1976 } | 1977 } |
1977 | 1978 |
1978 | 1979 |
1979 } // namespace content | 1980 } // namespace content |
OLD | NEW |