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/memory/singleton.h" | 6 #include "base/memory/singleton.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "base/test/test_timeouts.h" | 8 #include "base/test/test_timeouts.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "content/browser/browser_plugin/browser_plugin_guest.h" | 10 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
336 TestBrowserPluginGuest* test_guest() const { return test_guest_; } | 336 TestBrowserPluginGuest* test_guest() const { return test_guest_; } |
337 | 337 |
338 private: | 338 private: |
339 TestBrowserPluginEmbedder* test_embedder_; | 339 TestBrowserPluginEmbedder* test_embedder_; |
340 TestBrowserPluginGuest* test_guest_; | 340 TestBrowserPluginGuest* test_guest_; |
341 DISALLOW_COPY_AND_ASSIGN(BrowserPluginHostTest); | 341 DISALLOW_COPY_AND_ASSIGN(BrowserPluginHostTest); |
342 }; | 342 }; |
343 | 343 |
344 // This test loads a guest that has a busy loop, and therefore it hangs the | 344 // This test loads a guest that has a busy loop, and therefore it hangs the |
345 // guest. | 345 // guest. |
346 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, GuestUnresponsive) { | 346 // |
| 347 // Disabled on Windows and Linux since it is flaky. crbug.com/164812 |
| 348 #if defined(OS_WIN) || defined(OS_LINUX) |
| 349 #define MAYBE_GuestUnresponsive DISABLED_GuestUnresponsive |
| 350 #else |
| 351 #define MAYBE_GuestUnresponsive GuestUnresponsive |
| 352 #endif |
| 353 IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, |
| 354 MAYBE_GuestUnresponsive) { |
347 // Override the hang timeout for guest to be very small. | 355 // Override the hang timeout for guest to be very small. |
348 content::BrowserPluginGuest::set_factory_for_testing( | 356 content::BrowserPluginGuest::set_factory_for_testing( |
349 TestShortHangTimeoutGuestFactory::GetInstance()); | 357 TestShortHangTimeoutGuestFactory::GetInstance()); |
350 const char kEmbedderURL[] = | 358 const char kEmbedderURL[] = |
351 "files/browser_plugin_embedder_guest_unresponsive.html"; | 359 "files/browser_plugin_embedder_guest_unresponsive.html"; |
352 StartBrowserPluginTest(kEmbedderURL, kHTMLForGuestBusyLoop, true, ""); | 360 StartBrowserPluginTest(kEmbedderURL, kHTMLForGuestBusyLoop, true, ""); |
353 // Wait until the busy loop starts. | 361 // Wait until the busy loop starts. |
354 { | 362 { |
355 const string16 expected_title = ASCIIToUTF16("start"); | 363 const string16 expected_title = ASCIIToUTF16("start"); |
356 content::TitleWatcher title_watcher(test_guest()->web_contents(), | 364 content::TitleWatcher title_watcher(test_guest()->web_contents(), |
(...skipping 878 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1235 embedder_code); | 1243 embedder_code); |
1236 // Check for render view host at position (150, 150) that is outside the | 1244 // Check for render view host at position (150, 150) that is outside the |
1237 // bounds of our guest, so this would respond with the render view host of the | 1245 // bounds of our guest, so this would respond with the render view host of the |
1238 // embedder. | 1246 // embedder. |
1239 test_embedder()->WaitForRenderViewHostAtPosition(150, 150); | 1247 test_embedder()->WaitForRenderViewHostAtPosition(150, 150); |
1240 ASSERT_EQ(test_embedder()->web_contents()->GetRenderViewHost(), | 1248 ASSERT_EQ(test_embedder()->web_contents()->GetRenderViewHost(), |
1241 test_embedder()->last_rvh_at_position_response()); | 1249 test_embedder()->last_rvh_at_position_response()); |
1242 } | 1250 } |
1243 | 1251 |
1244 } // namespace content | 1252 } // namespace content |
OLD | NEW |