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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "content/public/browser/browser_thread.h" | 9 #include "content/public/browser/browser_thread.h" |
10 #include "content/public/common/content_switches.h" | 10 #include "content/public/common/content_switches.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 // a synchronous mouseup works correctly. | 159 // a synchronous mouseup works correctly. |
160 // This was never ported to Mac. The only thing remaining is to make | 160 // This was never ported to Mac. The only thing remaining is to make |
161 // SimulateMouseClick get to Mac plugins, currently it doesn't work. | 161 // SimulateMouseClick get to Mac plugins, currently it doesn't work. |
162 IN_PROC_BROWSER_TEST_F(PluginTest, | 162 IN_PROC_BROWSER_TEST_F(PluginTest, |
163 SelfDeletePluginInvokeInSynchronousMouseUp) { | 163 SelfDeletePluginInvokeInSynchronousMouseUp) { |
164 NavigateToURL(shell(), GetURL("execute_script_delete_in_mouse_up.html")); | 164 NavigateToURL(shell(), GetURL("execute_script_delete_in_mouse_up.html")); |
165 | 165 |
166 string16 expected_title(ASCIIToUTF16("OK")); | 166 string16 expected_title(ASCIIToUTF16("OK")); |
167 TitleWatcher title_watcher(shell()->web_contents(), expected_title); | 167 TitleWatcher title_watcher(shell()->web_contents(), expected_title); |
168 title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); | 168 title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); |
169 SimulateMouseClick(shell()->web_contents()); | 169 SimulateMouseClick(shell()->web_contents(), 0, |
| 170 WebKit::WebMouseEvent::ButtonLeft); |
170 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); | 171 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); |
171 } | 172 } |
172 #endif | 173 #endif |
173 | 174 |
174 // Flaky, http://crbug.com/60071. | 175 // Flaky, http://crbug.com/60071. |
175 IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequest404Response) { | 176 IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequest404Response) { |
176 GURL url(URLRequestMockHTTPJob::GetMockUrl( | 177 GURL url(URLRequestMockHTTPJob::GetMockUrl( |
177 FilePath().AppendASCII("npapi"). | 178 FilePath().AppendASCII("npapi"). |
178 AppendASCII("plugin_url_request_404.html"))); | 179 AppendASCII("plugin_url_request_404.html"))); |
179 LoadAndWait(url); | 180 LoadAndWait(url); |
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { | 456 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { |
456 TestPlugin("Java.html"); | 457 TestPlugin("Java.html"); |
457 } | 458 } |
458 | 459 |
459 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) { | 460 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) { |
460 TestPlugin("silverlight.html"); | 461 TestPlugin("silverlight.html"); |
461 } | 462 } |
462 #endif // defined(OS_WIN) | 463 #endif // defined(OS_WIN) |
463 | 464 |
464 } // namespace content | 465 } // namespace content |
OLD | NEW |