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_util.h" | 5 #include "base/file_util.h" |
6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 #include "chrome/test/automation/tab_proxy.h" | 9 #include "chrome/test/automation/tab_proxy.h" |
10 #include "chrome/test/ui/ui_test.h" | 10 #include "chrome/test/ui/ui_test.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 | 77 |
78 #if defined(OS_MACOSX) | 78 #if defined(OS_MACOSX) |
79 // TODO(brettw) this fails on Mac for unknown reasons. | 79 // TODO(brettw) this fails on Mac for unknown reasons. |
80 TEST_F(PPAPITest, DISABLED_DeviceContext2D) { | 80 TEST_F(PPAPITest, DISABLED_DeviceContext2D) { |
81 #else | 81 #else |
82 TEST_F(PPAPITest, DeviceContext2D) { | 82 TEST_F(PPAPITest, DeviceContext2D) { |
83 #endif | 83 #endif |
84 RunTest(FILE_PATH_LITERAL("test_device_context_2d.html")); | 84 RunTest(FILE_PATH_LITERAL("test_device_context_2d.html")); |
85 } | 85 } |
86 | 86 |
87 #if defined(OS_MACOSX) | |
88 // TODO(brettw) this fails on Mac for unknown reasons. | |
89 TEST_F(PPAPITest, DISABLED_ImageData) { | |
90 #else | |
91 TEST_F(PPAPITest, ImageData) { | 87 TEST_F(PPAPITest, ImageData) { |
92 #endif | |
93 RunTest(FILE_PATH_LITERAL("test_image_data.html")); | 88 RunTest(FILE_PATH_LITERAL("test_image_data.html")); |
94 } | 89 } |
95 | 90 |
96 TEST_F(PPAPITest, DISABLED_Buffer) { | 91 TEST_F(PPAPITest, Buffer) { |
97 RunTest(FILE_PATH_LITERAL("test_buffer.html")); | 92 RunTest(FILE_PATH_LITERAL("test_buffer.html")); |
98 } | 93 } |
99 | 94 |
OLD | NEW |