| 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/strings/utf_string_conversions.h" | 8 #include "base/strings/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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 // This was never ported to Mac. The only thing remaining is to make | 161 // This was never ported to Mac. The only thing remaining is to make |
| 162 // SimulateMouseClick get to Mac plugins, currently it doesn't work. | 162 // SimulateMouseClick get to Mac plugins, currently it doesn't work. |
| 163 IN_PROC_BROWSER_TEST_F(PluginTest, | 163 IN_PROC_BROWSER_TEST_F(PluginTest, |
| 164 MAYBE(SelfDeletePluginInvokeInSynchronousMouseUp)) { | 164 MAYBE(SelfDeletePluginInvokeInSynchronousMouseUp)) { |
| 165 NavigateToURL(shell(), GetURL("execute_script_delete_in_mouse_up.html")); | 165 NavigateToURL(shell(), GetURL("execute_script_delete_in_mouse_up.html")); |
| 166 | 166 |
| 167 string16 expected_title(ASCIIToUTF16("OK")); | 167 string16 expected_title(ASCIIToUTF16("OK")); |
| 168 TitleWatcher title_watcher(shell()->web_contents(), expected_title); | 168 TitleWatcher title_watcher(shell()->web_contents(), expected_title); |
| 169 title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); | 169 title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); |
| 170 SimulateMouseClick(shell()->web_contents(), 0, | 170 SimulateMouseClick(shell()->web_contents(), 0, |
| 171 WebKit::WebMouseEvent::ButtonLeft); | 171 blink::WebMouseEvent::ButtonLeft); |
| 172 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); | 172 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); |
| 173 } | 173 } |
| 174 #endif | 174 #endif |
| 175 | 175 |
| 176 // Flaky, http://crbug.com/302274. | 176 // Flaky, http://crbug.com/302274. |
| 177 #if defined(OS_MACOSX) | 177 #if defined(OS_MACOSX) |
| 178 #define MAYBE_GetURLRequest404Response DISABLED_GetURLRequest404Response | 178 #define MAYBE_GetURLRequest404Response DISABLED_GetURLRequest404Response |
| 179 #else | 179 #else |
| 180 #define MAYBE_GetURLRequest404Response MAYBE(GetURLRequest404Response) | 180 #define MAYBE_GetURLRequest404Response MAYBE(GetURLRequest404Response) |
| 181 #endif | 181 #endif |
| (...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 462 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { | 462 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { |
| 463 TestPlugin("Java.html"); | 463 TestPlugin("Java.html"); |
| 464 } | 464 } |
| 465 | 465 |
| 466 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Silverlight)) { | 466 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Silverlight)) { |
| 467 TestPlugin("silverlight.html"); | 467 TestPlugin("silverlight.html"); |
| 468 } | 468 } |
| 469 #endif // defined(OS_WIN) | 469 #endif // defined(OS_WIN) |
| 470 | 470 |
| 471 } // namespace content | 471 } // namespace content |
| OLD | NEW |