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 "apps/ui/native_app_window.h" | 5 #include "apps/ui/native_app_window.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.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/browser/apps/app_browsertest_util.h" | 9 #include "chrome/browser/apps/app_browsertest_util.h" |
10 #include "chrome/browser/chrome_content_browser_client.h" | 10 #include "chrome/browser/chrome_content_browser_client.h" |
11 #include "chrome/browser/extensions/extension_test_message_listener.h" | 11 #include "chrome/browser/extensions/extension_test_message_listener.h" |
12 #include "chrome/browser/guest_view/guest_view_manager.h" | |
13 #include "chrome/browser/guest_view/guest_view_manager_factory.h" | |
14 #include "chrome/browser/prerender/prerender_link_manager.h" | 12 #include "chrome/browser/prerender/prerender_link_manager.h" |
15 #include "chrome/browser/prerender/prerender_link_manager_factory.h" | 13 #include "chrome/browser/prerender/prerender_link_manager_factory.h" |
16 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" | 15 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
18 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti
l.h" | 16 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti
l.h" |
19 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" | 17 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" |
20 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
21 #include "chrome/browser/ui/browser_dialogs.h" | 19 #include "chrome/browser/ui/browser_dialogs.h" |
22 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
23 #include "chrome/test/base/ui_test_utils.h" | 21 #include "chrome/test/base/ui_test_utils.h" |
24 #include "content/public/browser/gpu_data_manager.h" | 22 #include "content/public/browser/gpu_data_manager.h" |
25 #include "content/public/browser/interstitial_page.h" | 23 #include "content/public/browser/interstitial_page.h" |
26 #include "content/public/browser/interstitial_page_delegate.h" | 24 #include "content/public/browser/interstitial_page_delegate.h" |
27 #include "content/public/browser/notification_service.h" | 25 #include "content/public/browser/notification_service.h" |
28 #include "content/public/browser/render_process_host.h" | 26 #include "content/public/browser/render_process_host.h" |
29 #include "content/public/browser/web_contents_delegate.h" | 27 #include "content/public/browser/web_contents_delegate.h" |
30 #include "content/public/common/content_switches.h" | 28 #include "content/public/common/content_switches.h" |
31 #include "content/public/test/browser_test_utils.h" | 29 #include "content/public/test/browser_test_utils.h" |
32 #include "content/public/test/fake_speech_recognition_manager.h" | 30 #include "content/public/test/fake_speech_recognition_manager.h" |
33 #include "content/public/test/test_renderer_host.h" | 31 #include "content/public/test/test_renderer_host.h" |
| 32 #include "extensions/browser/guest_view/guest_view_manager.h" |
| 33 #include "extensions/browser/guest_view/guest_view_manager_factory.h" |
34 #include "extensions/common/extension.h" | 34 #include "extensions/common/extension.h" |
35 #include "extensions/common/extensions_client.h" | 35 #include "extensions/common/extensions_client.h" |
36 #include "media/base/media_switches.h" | 36 #include "media/base/media_switches.h" |
37 #include "net/test/embedded_test_server/embedded_test_server.h" | 37 #include "net/test/embedded_test_server/embedded_test_server.h" |
38 #include "net/test/embedded_test_server/http_request.h" | 38 #include "net/test/embedded_test_server/http_request.h" |
39 #include "net/test/embedded_test_server/http_response.h" | 39 #include "net/test/embedded_test_server/http_response.h" |
40 #include "ui/gl/gl_switches.h" | 40 #include "ui/gl/gl_switches.h" |
41 | 41 |
42 #if defined(OS_CHROMEOS) | 42 #if defined(OS_CHROMEOS) |
43 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 43 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 }; | 87 }; |
88 | 88 |
89 class TestInterstitialPageDelegate : public content::InterstitialPageDelegate { | 89 class TestInterstitialPageDelegate : public content::InterstitialPageDelegate { |
90 public: | 90 public: |
91 TestInterstitialPageDelegate() { | 91 TestInterstitialPageDelegate() { |
92 } | 92 } |
93 virtual ~TestInterstitialPageDelegate() {} | 93 virtual ~TestInterstitialPageDelegate() {} |
94 virtual std::string GetHTMLContents() OVERRIDE { return std::string(); } | 94 virtual std::string GetHTMLContents() OVERRIDE { return std::string(); } |
95 }; | 95 }; |
96 | 96 |
97 class TestGuestViewManager : public GuestViewManager { | 97 class TestGuestViewManager : public extensions::GuestViewManager { |
98 public: | 98 public: |
99 explicit TestGuestViewManager(content::BrowserContext* context) : | 99 explicit TestGuestViewManager(content::BrowserContext* context) : |
100 GuestViewManager(context), | 100 GuestViewManager(context), |
101 web_contents_(NULL) {} | 101 web_contents_(NULL) {} |
102 | 102 |
103 content::WebContents* WaitForGuestCreated() { | 103 content::WebContents* WaitForGuestCreated() { |
104 if (web_contents_) | 104 if (web_contents_) |
105 return web_contents_; | 105 return web_contents_; |
106 | 106 |
107 message_loop_runner_ = new content::MessageLoopRunner; | 107 message_loop_runner_ = new content::MessageLoopRunner; |
108 message_loop_runner_->Run(); | 108 message_loop_runner_->Run(); |
109 return web_contents_; | 109 return web_contents_; |
110 } | 110 } |
111 | 111 |
112 private: | 112 private: |
113 // GuestViewManager override: | 113 // GuestViewManager override: |
114 virtual void AddGuest(int guest_instance_id, | 114 virtual void AddGuest(int guest_instance_id, |
115 content::WebContents* guest_web_contents) OVERRIDE{ | 115 content::WebContents* guest_web_contents) OVERRIDE{ |
116 GuestViewManager::AddGuest(guest_instance_id, guest_web_contents); | 116 extensions::GuestViewManager::AddGuest( |
| 117 guest_instance_id, guest_web_contents); |
117 web_contents_ = guest_web_contents; | 118 web_contents_ = guest_web_contents; |
118 | 119 |
119 if (message_loop_runner_) | 120 if (message_loop_runner_) |
120 message_loop_runner_->Quit(); | 121 message_loop_runner_->Quit(); |
121 } | 122 } |
122 | 123 |
123 content::WebContents* web_contents_; | 124 content::WebContents* web_contents_; |
124 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; | 125 scoped_refptr<content::MessageLoopRunner> message_loop_runner_; |
125 }; | 126 }; |
126 | 127 |
127 // Test factory for creating test instances of GuestViewManager. | 128 // Test factory for creating test instances of GuestViewManager. |
128 class TestGuestViewManagerFactory : public GuestViewManagerFactory { | 129 class TestGuestViewManagerFactory : |
| 130 public extensions::GuestViewManagerFactory { |
129 public: | 131 public: |
130 TestGuestViewManagerFactory() : | 132 TestGuestViewManagerFactory() : |
131 test_guest_view_manager_(NULL) {} | 133 test_guest_view_manager_(NULL) {} |
132 | 134 |
133 virtual ~TestGuestViewManagerFactory() {} | 135 virtual ~TestGuestViewManagerFactory() {} |
134 | 136 |
135 virtual GuestViewManager* CreateGuestViewManager( | 137 virtual extensions::GuestViewManager* CreateGuestViewManager( |
136 content::BrowserContext* context) OVERRIDE { | 138 content::BrowserContext* context) OVERRIDE { |
137 return GetManager(context); | 139 return GetManager(context); |
138 } | 140 } |
139 | 141 |
140 TestGuestViewManager* GetManager(content::BrowserContext* context) { | 142 TestGuestViewManager* GetManager(content::BrowserContext* context) { |
141 if (!test_guest_view_manager_) { | 143 if (!test_guest_view_manager_) { |
142 test_guest_view_manager_ = new TestGuestViewManager(context); | 144 test_guest_view_manager_ = new TestGuestViewManager(context); |
143 } | 145 } |
144 return test_guest_view_manager_; | 146 return test_guest_view_manager_; |
145 } | 147 } |
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
720 } | 722 } |
721 return embedder_web_contents_; | 723 return embedder_web_contents_; |
722 } | 724 } |
723 | 725 |
724 TestGuestViewManager* GetGuestViewManager() { | 726 TestGuestViewManager* GetGuestViewManager() { |
725 return factory_.GetManager(browser()->profile()); | 727 return factory_.GetManager(browser()->profile()); |
726 } | 728 } |
727 | 729 |
728 WebViewTest() : guest_web_contents_(NULL), | 730 WebViewTest() : guest_web_contents_(NULL), |
729 embedder_web_contents_(NULL) { | 731 embedder_web_contents_(NULL) { |
730 GuestViewManager::set_factory_for_testing(&factory_); | 732 extensions::GuestViewManager::set_factory_for_testing(&factory_); |
731 } | 733 } |
732 | 734 |
733 private: | 735 private: |
734 bool UsesFakeSpeech() { | 736 bool UsesFakeSpeech() { |
735 const testing::TestInfo* const test_info = | 737 const testing::TestInfo* const test_info = |
736 testing::UnitTest::GetInstance()->current_test_info(); | 738 testing::UnitTest::GetInstance()->current_test_info(); |
737 | 739 |
738 // SpeechRecognition test specific SetUp. | 740 // SpeechRecognition test specific SetUp. |
739 return !strcmp(test_info->name(), | 741 return !strcmp(test_info->name(), |
740 "SpeechRecognitionAPI_HasPermissionAllow"); | 742 "SpeechRecognitionAPI_HasPermissionAllow"); |
(...skipping 1502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2243 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { | 2245 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { |
2244 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); | 2246 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); |
2245 } | 2247 } |
2246 | 2248 |
2247 // <webview> screenshot capture fails with ubercomp. | 2249 // <webview> screenshot capture fails with ubercomp. |
2248 // See http://crbug.com/327035. | 2250 // See http://crbug.com/327035. |
2249 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, | 2251 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, |
2250 DISABLED_Shim_ScreenshotCapture) { | 2252 DISABLED_Shim_ScreenshotCapture) { |
2251 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); | 2253 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); |
2252 } | 2254 } |
OLD | NEW |