| Index: ui/gfx/color_analysis_unittest.cc
|
| diff --git a/ui/gfx/color_analysis_unittest.cc b/ui/gfx/color_analysis_unittest.cc
|
| index 903161fd59e05c007da05a8a38889fae6f06815e..d667d0c2f59857b686d915d9ab9fdeb662b1a52d 100644
|
| --- a/ui/gfx/color_analysis_unittest.cc
|
| +++ b/ui/gfx/color_analysis_unittest.cc
|
| @@ -296,7 +296,13 @@ TEST_F(ColorAnalysisTest, FindClosestColor) {
|
| EXPECT_EQ(SK_ColorBLACK, color);
|
| }
|
|
|
| -TEST_F(ColorAnalysisTest, CalculateKMeanColorOfBitmap) {
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_CalculateKMeanColorOfBitmap DISABLED_CalculateKMeanColorOfBitmap
|
| +#else
|
| +#define MAYBE_CalculateKMeanColorOfBitmap CalculateKMeanColorOfBitmap
|
| +#endif
|
| +
|
| +TEST_F(ColorAnalysisTest, MAYBE_CalculateKMeanColorOfBitmap) {
|
| // Create a 16x16 bitmap to represent a favicon.
|
| SkBitmap bitmap;
|
| bitmap.allocN32Pixels(16, 16);
|
| @@ -353,7 +359,14 @@ TEST_F(ColorAnalysisTest, ComputeColorCovarianceWithCanvas) {
|
| EXPECT_EQ(expected_covariance, covariance);
|
| }
|
|
|
| -TEST_F(ColorAnalysisTest, ApplyColorReductionSingleColor) {
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_ApplyColorReductionSingleColor \
|
| + DISABLED_ApplyColorReductionSingleColor
|
| +#else
|
| +#define MAYBE_ApplyColorReductionSingleColor ApplyColorReductionSingleColor
|
| +#endif
|
| +
|
| +TEST_F(ColorAnalysisTest, MAYBE_ApplyColorReductionSingleColor) {
|
| // The test runs color reduction on a single-colot image, where results are
|
| // bound to be uninteresting. This is an important edge case, though.
|
| SkBitmap source, result;
|
| @@ -430,6 +443,13 @@ TEST_F(ColorAnalysisTest, ApplyColorReductionBlackAndWhite) {
|
| EXPECT_EQ(min_gl, SkColorGetA(result.getColor(299, 199)));
|
| }
|
|
|
| +#if defined(OS_ANDROID)
|
| +#define MAYBE_ApplyColorReductionMultiColor \
|
| + DISABLED_ApplyColorReductionMultiColor
|
| +#else
|
| +#define MAYBE_ApplyColorReductionMultiColor ApplyColorReductionMultiColor
|
| +#endif
|
| +
|
| TEST_F(ColorAnalysisTest, ApplyColorReductionMultiColor) {
|
| // Check with images with multiple colors. This is really different only when
|
| // the result is scaled.
|
|
|