| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/file_path.h" | 5 #include "base/file_path.h" |
| 6 #include "chrome/common/chrome_switches.h" | 6 #include "chrome/common/chrome_switches.h" |
| 7 #include "chrome/test/ui/npapi_test_helper.h" | 7 #include "chrome/test/ui/npapi_test_helper.h" |
| 8 #include "chrome/test/ui_test_utils.h" | 8 #include "chrome/test/ui_test_utils.h" |
| 9 | 9 |
| 10 #if defined(OS_WIN) | 10 #if defined(OS_WIN) |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 launch_arguments_.AppendSwitch(switches::kNoSandbox); | 28 launch_arguments_.AppendSwitch(switches::kNoSandbox); |
| 29 launch_arguments_.AppendSwitch(switches::kInternalPepper); | 29 launch_arguments_.AppendSwitch(switches::kInternalPepper); |
| 30 launch_arguments_.AppendSwitch(switches::kEnableGPUPlugin); | 30 launch_arguments_.AppendSwitch(switches::kEnableGPUPlugin); |
| 31 NPAPITesterBase::SetUp(); | 31 NPAPITesterBase::SetUp(); |
| 32 } | 32 } |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 // Test that a pepper 3d plugin loads and renders. | 35 // Test that a pepper 3d plugin loads and renders. |
| 36 // TODO(alokp): Enable the test after making sure it works on all platforms | 36 // TODO(alokp): Enable the test after making sure it works on all platforms |
| 37 // and buildbots have OpenGL support. | 37 // and buildbots have OpenGL support. |
| 38 // Fails on XP Build. http://crbug.com/44603 |
| 38 #if defined(OS_WIN) | 39 #if defined(OS_WIN) |
| 39 TEST_F(PepperTester, Pepper3D) { | 40 TEST_F(PepperTester, FAILS_Pepper3D) { |
| 40 const FilePath dir(FILE_PATH_LITERAL("pepper")); | 41 const FilePath dir(FILE_PATH_LITERAL("pepper")); |
| 41 const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); | 42 const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); |
| 42 GURL url = ui_test_utils::GetTestUrl(dir, file); | 43 GURL url = ui_test_utils::GetTestUrl(dir, file); |
| 43 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); | 44 ASSERT_NO_FATAL_FAILURE(NavigateToURL(url)); |
| 44 WaitForFinish("pepper_3d", "1", url, | 45 WaitForFinish("pepper_3d", "1", url, |
| 45 kTestCompleteCookie, kTestCompleteSuccess, | 46 kTestCompleteCookie, kTestCompleteSuccess, |
| 46 action_max_timeout_ms()); | 47 action_max_timeout_ms()); |
| 47 } | 48 } |
| 48 #endif | 49 #endif |
| OLD | NEW |