Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(107)

Side by Side Diff: chrome/browser/apps/guest_view/web_view_browsertest.cc

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed John's comments Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 guest_view::GuestViewManager;
74 using guest_view::TestGuestViewManager;
75 using guest_view::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 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 806
806 TestGuestViewManager* GetGuestViewManager() { 807 TestGuestViewManager* GetGuestViewManager() {
807 TestGuestViewManager* manager = static_cast<TestGuestViewManager*>( 808 TestGuestViewManager* manager = static_cast<TestGuestViewManager*>(
808 TestGuestViewManager::FromBrowserContext(browser()->profile())); 809 TestGuestViewManager::FromBrowserContext(browser()->profile()));
809 // TestGuestViewManager::WaitForSingleGuestCreated may and will get called 810 // TestGuestViewManager::WaitForSingleGuestCreated may and will get called
810 // before a guest is created. 811 // before a guest is created.
811 if (!manager) { 812 if (!manager) {
812 manager = static_cast<TestGuestViewManager*>( 813 manager = static_cast<TestGuestViewManager*>(
813 GuestViewManager::CreateWithDelegate( 814 GuestViewManager::CreateWithDelegate(
814 browser()->profile(), 815 browser()->profile(),
815 scoped_ptr<guestview::GuestViewManagerDelegate>( 816 scoped_ptr<guest_view::GuestViewManagerDelegate>(
816 new ExtensionsGuestViewManagerDelegate( 817 new ExtensionsGuestViewManagerDelegate(
817 browser()->profile())))); 818 browser()->profile()))));
818 } 819 }
819 return manager; 820 return manager;
820 } 821 }
821 822
822 WebViewTest() : guest_web_contents_(NULL), 823 WebViewTest() : guest_web_contents_(NULL),
823 embedder_web_contents_(NULL) { 824 embedder_web_contents_(NULL) {
824 extensions::GuestViewManager::set_factory_for_testing(&factory_); 825 GuestViewManager::set_factory_for_testing(&factory_);
825 } 826 }
826 827
827 private: 828 private:
828 bool UsesFakeSpeech() { 829 bool UsesFakeSpeech() {
829 const testing::TestInfo* const test_info = 830 const testing::TestInfo* const test_info =
830 testing::UnitTest::GetInstance()->current_test_info(); 831 testing::UnitTest::GetInstance()->current_test_info();
831 832
832 // SpeechRecognition test specific SetUp. 833 // SpeechRecognition test specific SetUp.
833 return !strcmp(test_info->name(), 834 return !strcmp(test_info->name(),
834 "SpeechRecognitionAPI_HasPermissionAllow"); 835 "SpeechRecognitionAPI_HasPermissionAllow");
835 } 836 }
836 837
837 scoped_ptr<content::FakeSpeechRecognitionManager> 838 scoped_ptr<content::FakeSpeechRecognitionManager>
838 fake_speech_recognition_manager_; 839 fake_speech_recognition_manager_;
839 840
840 extensions::TestGuestViewManagerFactory factory_; 841 TestGuestViewManagerFactory factory_;
841 // Note that these are only set if you launch app using LoadAppWithGuest(). 842 // Note that these are only set if you launch app using LoadAppWithGuest().
842 content::WebContents* guest_web_contents_; 843 content::WebContents* guest_web_contents_;
843 content::WebContents* embedder_web_contents_; 844 content::WebContents* embedder_web_contents_;
844 }; 845 };
845 846
846 class WebViewDPITest : public WebViewTest { 847 class WebViewDPITest : public WebViewTest {
847 protected: 848 protected:
848 void SetUpCommandLine(base::CommandLine* command_line) override { 849 void SetUpCommandLine(base::CommandLine* command_line) override {
849 WebViewTest::SetUpCommandLine(command_line); 850 WebViewTest::SetUpCommandLine(command_line);
850 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor, 851 command_line->AppendSwitchASCII(switches::kForceDeviceScaleFactor,
(...skipping 1931 matching lines...) Expand 10 before | Expand all | Expand 10 after
2782 // This test verifies that the allowtransparency attribute properly propagates 2783 // This test verifies that the allowtransparency attribute properly propagates
2783 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) { 2784 IN_PROC_BROWSER_TEST_F(WebViewTest, AllowTransparencyAndAllowScalingPropagate) {
2784 LoadAppWithGuest("web_view/simple"); 2785 LoadAppWithGuest("web_view/simple");
2785 2786
2786 ASSERT_TRUE(!!GetGuestWebContents()); 2787 ASSERT_TRUE(!!GetGuestWebContents());
2787 extensions::WebViewGuest* guest = 2788 extensions::WebViewGuest* guest =
2788 extensions::WebViewGuest::FromWebContents(GetGuestWebContents()); 2789 extensions::WebViewGuest::FromWebContents(GetGuestWebContents());
2789 ASSERT_TRUE(guest->allow_transparency()); 2790 ASSERT_TRUE(guest->allow_transparency());
2790 ASSERT_TRUE(guest->allow_scaling()); 2791 ASSERT_TRUE(guest->allow_scaling());
2791 } 2792 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698