| 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 15 matching lines...) Expand all Loading... |
| 26 #include "content/test/test_browser_thread.h" | 26 #include "content/test/test_browser_thread.h" |
| 27 #include "testing/gtest/include/gtest/gtest.h" | 27 #include "testing/gtest/include/gtest/gtest.h" |
| 28 #include "webkit/glue/webkit_glue.h" | 28 #include "webkit/glue/webkit_glue.h" |
| 29 | 29 |
| 30 using content::BrowserContext; | 30 using content::BrowserContext; |
| 31 using content::BrowserThread; | 31 using content::BrowserThread; |
| 32 using content::InterstitialPage; | 32 using content::InterstitialPage; |
| 33 using content::NavigationEntry; | 33 using content::NavigationEntry; |
| 34 using content::NavigationEntryImpl; | 34 using content::NavigationEntryImpl; |
| 35 using content::SiteInstance; | 35 using content::SiteInstance; |
| 36 using content::TestRenderViewHost; |
| 36 using content::WebContents; | 37 using content::WebContents; |
| 37 using content::WebUI; | 38 using content::WebUI; |
| 38 using content::WebUIController; | 39 using content::WebUIController; |
| 39 using webkit::forms::PasswordForm; | 40 using webkit::forms::PasswordForm; |
| 40 | 41 |
| 41 namespace { | 42 namespace { |
| 42 | 43 |
| 43 class TabContentsTestWebUIControllerFactory | 44 class TabContentsTestWebUIControllerFactory |
| 44 : public content::WebUIControllerFactory { | 45 : public content::WebUIControllerFactory { |
| 45 public: | 46 public: |
| (...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 | 195 |
| 195 void CommandReceived() { | 196 void CommandReceived() { |
| 196 command_received_count_++; | 197 command_received_count_++; |
| 197 } | 198 } |
| 198 | 199 |
| 199 void set_delegate(Delegate* delegate) { | 200 void set_delegate(Delegate* delegate) { |
| 200 delegate_ = delegate; | 201 delegate_ = delegate; |
| 201 } | 202 } |
| 202 | 203 |
| 203 protected: | 204 protected: |
| 204 virtual RenderViewHost* CreateRenderViewHost() OVERRIDE { | 205 virtual content::RenderViewHost* CreateRenderViewHost() OVERRIDE { |
| 205 return new TestRenderViewHost( | 206 return new TestRenderViewHost( |
| 206 SiteInstance::Create(tab()->GetBrowserContext()), | 207 SiteInstance::Create(tab()->GetBrowserContext()), |
| 207 this, MSG_ROUTING_NONE); | 208 this, MSG_ROUTING_NONE); |
| 208 } | 209 } |
| 209 | 210 |
| 210 virtual content::WebContentsView* CreateWebContentsView() OVERRIDE { | 211 virtual content::WebContentsView* CreateWebContentsView() OVERRIDE { |
| 211 return NULL; | 212 return NULL; |
| 212 } | 213 } |
| 213 | 214 |
| 214 private: | 215 private: |
| (...skipping 1673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1888 // It should have a transient entry. | 1889 // It should have a transient entry. |
| 1889 EXPECT_TRUE(other_controller.GetTransientEntry()); | 1890 EXPECT_TRUE(other_controller.GetTransientEntry()); |
| 1890 | 1891 |
| 1891 // And the interstitial should be showing. | 1892 // And the interstitial should be showing. |
| 1892 EXPECT_TRUE(other_contents->ShowingInterstitialPage()); | 1893 EXPECT_TRUE(other_contents->ShowingInterstitialPage()); |
| 1893 | 1894 |
| 1894 // And the interstitial should do a reload on don't proceed. | 1895 // And the interstitial should do a reload on don't proceed. |
| 1895 EXPECT_TRUE(static_cast<InterstitialPageImpl*>( | 1896 EXPECT_TRUE(static_cast<InterstitialPageImpl*>( |
| 1896 other_contents->GetInterstitialPage())->reload_on_dont_proceed()); | 1897 other_contents->GetInterstitialPage())->reload_on_dont_proceed()); |
| 1897 } | 1898 } |
| OLD | NEW |