| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 // windows headers | 8 // windows headers |
| 9 #include <comutil.h> | 9 #include <comutil.h> |
| 10 #include <shellapi.h> | 10 #include <shellapi.h> |
| (...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 432 FilePath(FILE_PATH_LITERAL( | 432 FilePath(FILE_PATH_LITERAL( |
| 433 "npapi/plugin_url_request_referrer_test.html")))); | 433 "npapi/plugin_url_request_referrer_test.html")))); |
| 434 | 434 |
| 435 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 435 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
| 436 | 436 |
| 437 WaitForFinish("plugin_referrer_test", "1", url, kTestCompleteCookie, | 437 WaitForFinish("plugin_referrer_test", "1", url, kTestCompleteCookie, |
| 438 kTestCompleteSuccess, action_max_timeout_ms()); | 438 kTestCompleteSuccess, action_max_timeout_ms()); |
| 439 } | 439 } |
| 440 | 440 |
| 441 #if defined(OS_MACOSX) | 441 #if defined(OS_MACOSX) |
| 442 // http://crbug.com/36670 - failes on 10.6 | 442 TEST_F(NPAPIVisiblePluginTester, PluginConvertPointTest) { |
| 443 TEST_F(NPAPIVisiblePluginTester, FLAKY_PluginConvertPointTest) { | |
| 444 if (UITest::in_process_renderer()) | 443 if (UITest::in_process_renderer()) |
| 445 return; | 444 return; |
| 446 | 445 |
| 447 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 446 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 448 ASSERT_TRUE(browser.get()); | 447 ASSERT_TRUE(browser.get()); |
| 449 scoped_refptr<WindowProxy> window(browser->GetWindow()); | 448 scoped_refptr<WindowProxy> window(browser->GetWindow()); |
| 450 ASSERT_TRUE(window.get()); | 449 ASSERT_TRUE(window.get()); |
| 451 window->SetBounds(gfx::Rect(100, 100, 600, 600)); | 450 window->SetBounds(gfx::Rect(50, 50, 400, 400)); |
| 452 | 451 |
| 453 GURL url(URLRequestMockHTTPJob::GetMockUrl( | 452 GURL url(URLRequestMockHTTPJob::GetMockUrl( |
| 454 FilePath(FILE_PATH_LITERAL("npapi/convert_point.html")))); | 453 FilePath(FILE_PATH_LITERAL("npapi/convert_point.html")))); |
| 455 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 454 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
| 456 | 455 |
| 457 // TODO(stuartmorgan): When the automation system supports sending clicks, | 456 // TODO(stuartmorgan): When the automation system supports sending clicks, |
| 458 // change the test to trigger on mouse-down rather than window focus. | 457 // change the test to trigger on mouse-down rather than window focus. |
| 459 ASSERT_TRUE(browser->BringToFront()); | 458 ASSERT_TRUE(browser->BringToFront()); |
| 460 WaitForFinish("convert_point", "1", url, kTestCompleteCookie, | 459 WaitForFinish("convert_point", "1", url, kTestCompleteCookie, |
| 461 kTestCompleteSuccess, action_max_timeout_ms()); | 460 kTestCompleteSuccess, action_max_timeout_ms()); |
| 462 } | 461 } |
| 463 #endif | 462 #endif |
| OLD | NEW |