| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/path_service.h" | 5 #include "base/path_service.h" |
| 6 #include "base/process/process.h" | 6 #include "base/process/process.h" |
| 7 #include "base/strings/stringprintf.h" | 7 #include "base/strings/stringprintf.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
| 10 #include "chrome/browser/apps/app_browsertest_util.h" | 10 #include "chrome/browser/apps/app_browsertest_util.h" |
| 11 #include "chrome/browser/chrome_content_browser_client.h" | 11 #include "chrome/browser/chrome_content_browser_client.h" |
| 12 #include "chrome/browser/lifetime/application_lifetime.h" | 12 #include "chrome/browser/lifetime/application_lifetime.h" |
| 13 #include "chrome/browser/prerender/prerender_link_manager.h" | 13 #include "chrome/browser/prerender/prerender_link_manager.h" |
| 14 #include "chrome/browser/prerender/prerender_link_manager_factory.h" | 14 #include "chrome/browser/prerender/prerender_link_manager_factory.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" | 16 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
| 17 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti
l.h" | 17 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti
l.h" |
| 18 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 18 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
| 19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
| 20 #include "chrome/browser/ui/browser_dialogs.h" | 20 #include "chrome/browser/ui/browser_dialogs.h" |
| 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 22 #include "chrome/test/base/ui_test_utils.h" | 22 #include "chrome/test/base/ui_test_utils.h" |
| 23 #include "components/content_settings/core/browser/host_content_settings_map.h" | 23 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 24 #include "components/guest_view/browser/guest_view_manager.h" |
| 25 #include "components/guest_view/browser/guest_view_manager_factory.h" |
| 26 #include "components/guest_view/browser/test_guest_view_manager.h" |
| 24 #include "content/public/browser/gpu_data_manager.h" | 27 #include "content/public/browser/gpu_data_manager.h" |
| 25 #include "content/public/browser/interstitial_page.h" | 28 #include "content/public/browser/interstitial_page.h" |
| 26 #include "content/public/browser/interstitial_page_delegate.h" | 29 #include "content/public/browser/interstitial_page_delegate.h" |
| 27 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
| 28 #include "content/public/browser/render_process_host.h" | 31 #include "content/public/browser/render_process_host.h" |
| 29 #include "content/public/browser/web_contents_delegate.h" | 32 #include "content/public/browser/web_contents_delegate.h" |
| 30 #include "content/public/common/content_switches.h" | 33 #include "content/public/common/content_switches.h" |
| 31 #include "content/public/test/browser_test_utils.h" | 34 #include "content/public/test/browser_test_utils.h" |
| 32 #include "content/public/test/fake_speech_recognition_manager.h" | 35 #include "content/public/test/fake_speech_recognition_manager.h" |
| 33 #include "content/public/test/test_renderer_host.h" | 36 #include "content/public/test/test_renderer_host.h" |
| 34 #include "extensions/browser/api/declarative/rules_registry.h" | 37 #include "extensions/browser/api/declarative/rules_registry.h" |
| 35 #include "extensions/browser/api/declarative/rules_registry_service.h" | 38 #include "extensions/browser/api/declarative/rules_registry_service.h" |
| 36 #include "extensions/browser/api/declarative/test_rules_registry.h" | 39 #include "extensions/browser/api/declarative/test_rules_registry.h" |
| 37 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h" | 40 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h" |
| 38 #include "extensions/browser/app_window/native_app_window.h" | 41 #include "extensions/browser/app_window/native_app_window.h" |
| 39 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
" | 42 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
" |
| 40 #include "extensions/browser/guest_view/guest_view_manager.h" | |
| 41 #include "extensions/browser/guest_view/guest_view_manager_factory.h" | |
| 42 #include "extensions/browser/guest_view/test_guest_view_manager.h" | |
| 43 #include "extensions/browser/guest_view/web_view/web_view_guest.h" | 43 #include "extensions/browser/guest_view/web_view/web_view_guest.h" |
| 44 #include "extensions/common/extension.h" | 44 #include "extensions/common/extension.h" |
| 45 #include "extensions/common/extensions_client.h" | 45 #include "extensions/common/extensions_client.h" |
| 46 #include "extensions/test/extension_test_message_listener.h" | 46 #include "extensions/test/extension_test_message_listener.h" |
| 47 #include "media/base/media_switches.h" | 47 #include "media/base/media_switches.h" |
| 48 #include "net/test/embedded_test_server/embedded_test_server.h" | 48 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 49 #include "net/test/embedded_test_server/http_request.h" | 49 #include "net/test/embedded_test_server/http_request.h" |
| 50 #include "net/test/embedded_test_server/http_response.h" | 50 #include "net/test/embedded_test_server/http_response.h" |
| 51 #include "ui/gfx/switches.h" | 51 #include "ui/gfx/switches.h" |
| 52 #include "ui/gl/gl_switches.h" | 52 #include "ui/gl/gl_switches.h" |
| 53 | 53 |
| 54 #if defined(ENABLE_PLUGINS) | 54 #if defined(ENABLE_PLUGINS) |
| 55 #include "content/public/browser/plugin_service.h" | 55 #include "content/public/browser/plugin_service.h" |
| 56 #include "content/public/common/webplugininfo.h" | 56 #include "content/public/common/webplugininfo.h" |
| 57 #include "content/public/test/ppapi_test_utils.h" | 57 #include "content/public/test/ppapi_test_utils.h" |
| 58 #endif | 58 #endif |
| 59 | 59 |
| 60 #if defined(OS_CHROMEOS) | 60 #if defined(OS_CHROMEOS) |
| 61 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 61 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| 62 #include "chrome/browser/chromeos/accessibility/speech_monitor.h" | 62 #include "chrome/browser/chromeos/accessibility/speech_monitor.h" |
| 63 #endif | 63 #endif |
| 64 | 64 |
| 65 // For fine-grained suppression on flaky tests. | 65 // For fine-grained suppression on flaky tests. |
| 66 #if defined(OS_WIN) | 66 #if defined(OS_WIN) |
| 67 #include "base/win/windows_version.h" | 67 #include "base/win/windows_version.h" |
| 68 #endif | 68 #endif |
| 69 | 69 |
| 70 using extensions::ContextMenuMatcher; | 70 using extensions::ContextMenuMatcher; |
| 71 using extensions::ExtensionsGuestViewManagerDelegate; | 71 using extensions::ExtensionsGuestViewManagerDelegate; |
| 72 using extensions::GuestViewManager; | |
| 73 using extensions::TestGuestViewManager; | |
| 74 using extensions::MenuItem; | 72 using extensions::MenuItem; |
| 73 using guestview::GuestViewManager; |
| 74 using guestview::TestGuestViewManager; |
| 75 using guestview::TestGuestViewManagerFactory; |
| 75 using prerender::PrerenderLinkManager; | 76 using prerender::PrerenderLinkManager; |
| 76 using prerender::PrerenderLinkManagerFactory; | 77 using prerender::PrerenderLinkManagerFactory; |
| 77 using task_manager::browsertest_util::MatchAboutBlankTab; | 78 using task_manager::browsertest_util::MatchAboutBlankTab; |
| 78 using task_manager::browsertest_util::MatchAnyApp; | 79 using task_manager::browsertest_util::MatchAnyApp; |
| 79 using task_manager::browsertest_util::MatchAnyBackground; | 80 using task_manager::browsertest_util::MatchAnyBackground; |
| 80 using task_manager::browsertest_util::MatchAnyTab; | 81 using task_manager::browsertest_util::MatchAnyTab; |
| 81 using task_manager::browsertest_util::MatchAnyWebView; | 82 using task_manager::browsertest_util::MatchAnyWebView; |
| 82 using task_manager::browsertest_util::MatchApp; | 83 using task_manager::browsertest_util::MatchApp; |
| 83 using task_manager::browsertest_util::MatchBackground; | 84 using task_manager::browsertest_util::MatchBackground; |
| 84 using task_manager::browsertest_util::MatchWebView; | 85 using task_manager::browsertest_util::MatchWebView; |
| (...skipping 746 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 browser()->profile(), | 832 browser()->profile(), |
| 832 scoped_ptr<guestview::GuestViewManagerDelegate>( | 833 scoped_ptr<guestview::GuestViewManagerDelegate>( |
| 833 new ExtensionsGuestViewManagerDelegate( | 834 new ExtensionsGuestViewManagerDelegate( |
| 834 browser()->profile())))); | 835 browser()->profile())))); |
| 835 } | 836 } |
| 836 return manager; | 837 return manager; |
| 837 } | 838 } |
| 838 | 839 |
| 839 WebViewTest() : guest_web_contents_(NULL), | 840 WebViewTest() : guest_web_contents_(NULL), |
| 840 embedder_web_contents_(NULL) { | 841 embedder_web_contents_(NULL) { |
| 841 extensions::GuestViewManager::set_factory_for_testing(&factory_); | 842 GuestViewManager::set_factory_for_testing(&factory_); |
| 842 } | 843 } |
| 843 | 844 |
| 844 private: | 845 private: |
| 845 bool UsesFakeSpeech() { | 846 bool UsesFakeSpeech() { |
| 846 const testing::TestInfo* const test_info = | 847 const testing::TestInfo* const test_info = |
| 847 testing::UnitTest::GetInstance()->current_test_info(); | 848 testing::UnitTest::GetInstance()->current_test_info(); |
| 848 | 849 |
| 849 // SpeechRecognition test specific SetUp. | 850 // SpeechRecognition test specific SetUp. |
| 850 return !strcmp(test_info->name(), | 851 return !strcmp(test_info->name(), |
| 851 "SpeechRecognitionAPI_HasPermissionAllow"); | 852 "SpeechRecognitionAPI_HasPermissionAllow"); |
| 852 } | 853 } |
| 853 | 854 |
| 854 scoped_ptr<content::FakeSpeechRecognitionManager> | 855 scoped_ptr<content::FakeSpeechRecognitionManager> |
| 855 fake_speech_recognition_manager_; | 856 fake_speech_recognition_manager_; |
| 856 | 857 |
| 857 extensions::TestGuestViewManagerFactory factory_; | 858 TestGuestViewManagerFactory factory_; |
| 858 // Note that these are only set if you launch app using LoadAppWithGuest(). | 859 // Note that these are only set if you launch app using LoadAppWithGuest(). |
| 859 content::WebContents* guest_web_contents_; | 860 content::WebContents* guest_web_contents_; |
| 860 content::WebContents* embedder_web_contents_; | 861 content::WebContents* embedder_web_contents_; |
| 861 }; | 862 }; |
| 862 | 863 |
| 863 class WebViewDPITest : public WebViewTest { | 864 class WebViewDPITest : public WebViewTest { |
| 864 protected: | 865 protected: |
| 865 void SetUpCommandLine(base::CommandLine* command_line) override { | 866 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 866 WebViewTest::SetUpCommandLine(command_line); | 867 WebViewTest::SetUpCommandLine(command_line); |
| 867 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, | 868 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, |
| (...skipping 1941 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2809 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { | 2810 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { |
| 2810 LoadAppWithGuest("web_view/simple"); | 2811 LoadAppWithGuest("web_view/simple"); |
| 2811 | 2812 |
| 2812 ASSERT_TRUE(!!GetGuestWebContents()); | 2813 ASSERT_TRUE(!!GetGuestWebContents()); |
| 2813 extensions::WebViewGuest* guest = | 2814 extensions::WebViewGuest* guest = |
| 2814 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); | 2815 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); |
| 2815 ASSERT_TRUE(guest->allow_transparency()); | 2816 ASSERT_TRUE(guest->allow_transparency()); |
| 2816 ASSERT_TRUE(guest->allow_scaling()); | 2817 ASSERT_TRUE(guest->allow_scaling()); |
| 2817 } | 2818 } |
| 2818 | 2819 |
| OLD | NEW |