| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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" |
| 11 #include "content/browser/site_instance.h" | 11 #include "content/browser/site_instance.h" |
| 12 #include "content/browser/tab_contents/interstitial_page.h" | 12 #include "content/browser/tab_contents/interstitial_page.h" |
| 13 #include "content/browser/tab_contents/navigation_details.h" | 13 #include "content/browser/tab_contents/navigation_details.h" |
| 14 #include "content/browser/tab_contents/navigation_entry.h" | 14 #include "content/browser/tab_contents/navigation_entry.h" |
| 15 #include "content/browser/tab_contents/test_tab_contents.h" | 15 #include "content/browser/tab_contents/test_tab_contents.h" |
| 16 #include "content/browser/webui/empty_web_ui_factory.h" | 16 #include "content/browser/webui/empty_web_ui_factory.h" |
| 17 #include "content/common/view_messages.h" | 17 #include "content/common/view_messages.h" |
| 18 #include "content/public/browser/notification_details.h" | 18 #include "content/public/browser/notification_details.h" |
| 19 #include "content/public/browser/notification_source.h" | 19 #include "content/public/browser/notification_source.h" |
| 20 #include "content/public/browser/notification_source.h" | 20 #include "content/public/browser/notification_source.h" |
| 21 #include "content/public/common/bindings_policy.h" | 21 #include "content/public/common/bindings_policy.h" |
| 22 #include "content/public/common/content_constants.h" | 22 #include "content/public/common/content_constants.h" |
| 23 #include "content/public/common/url_constants.h" | 23 #include "content/public/common/url_constants.h" |
| 24 #include "content/test/test_browser_thread.h" | 24 #include "content/test/test_browser_thread.h" |
| 25 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
| 26 #include "webkit/glue/webkit_glue.h" | 26 #include "webkit/glue/webkit_glue.h" |
| 27 | 27 |
| 28 using content::BrowserThread; | 28 using content::BrowserThread; |
| 29 using webkit_glue::PasswordForm; | 29 using webkit::forms::PasswordForm; |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| 32 | 32 |
| 33 class TabContentsTestWebUIFactory : public content::EmptyWebUIFactory { | 33 class TabContentsTestWebUIFactory : public content::EmptyWebUIFactory { |
| 34 public: | 34 public: |
| 35 virtual WebUI* CreateWebUIForURL(TabContents* source, | 35 virtual WebUI* CreateWebUIForURL(TabContents* source, |
| 36 const GURL& url) const OVERRIDE { | 36 const GURL& url) const OVERRIDE { |
| 37 if (!HasWebUIScheme(url)) | 37 if (!HasWebUIScheme(url)) |
| 38 return NULL; | 38 return NULL; |
| 39 | 39 |
| (...skipping 1737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1777 | 1777 |
| 1778 // It should have a transient entry. | 1778 // It should have a transient entry. |
| 1779 EXPECT_TRUE(other_controller.GetTransientEntry()); | 1779 EXPECT_TRUE(other_controller.GetTransientEntry()); |
| 1780 | 1780 |
| 1781 // And the interstitial should be showing. | 1781 // And the interstitial should be showing. |
| 1782 EXPECT_TRUE(other_contents->showing_interstitial_page()); | 1782 EXPECT_TRUE(other_contents->showing_interstitial_page()); |
| 1783 | 1783 |
| 1784 // And the interstitial should do a reload on don't proceed. | 1784 // And the interstitial should do a reload on don't proceed. |
| 1785 EXPECT_TRUE(other_contents->interstitial_page()->reload_on_dont_proceed()); | 1785 EXPECT_TRUE(other_contents->interstitial_page()->reload_on_dont_proceed()); |
| 1786 } | 1786 } |
| OLD | NEW |