Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

1 files changed, 8 insertions, 4 deletions

diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc
index c57f715215..e88ca9f089 100644
--- a/media/base/yuv_convert_unittest.cc
+++ b/media/base/yuv_convert_unittest.cc
@@ -37,12 +37,12 @@ static const int kRGB24Size = kSourceYSize * 3;
 static const int kRGBSizeConverted = kSourceYSize * kBpp;
 
 // Helper for reading test data into a scoped_array<uint8>.
-static void ReadData(const FilePath::CharType* filename,
+static void ReadData(const base::FilePath::CharType* filename,
                      int expected_size,
                      scoped_array<uint8>* data) {
   data->reset(new uint8[expected_size]);
 
-  FilePath path;
+  base::FilePath path;
   CHECK(PathService::Get(base::DIR_SOURCE_ROOT, &path));
   path = path.Append(FILE_PATH_LITERAL("media"))
              .Append(FILE_PATH_LITERAL("test"))
@@ -337,7 +337,7 @@ TEST(YUVConvertTest, RGB32ToYUV) {
   scoped_array<uint8> rgb_converted_bytes(new uint8[kRGBSize]);
 
   // Read YUV reference data from file.
-  FilePath yuv_url;
+  base::FilePath yuv_url;
   EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &yuv_url));
   yuv_url = yuv_url.Append(FILE_PATH_LITERAL("media"))
                    .Append(FILE_PATH_LITERAL("test"))
@@ -415,7 +415,7 @@ TEST(YUVConvertTest, YUY2ToYUV) {
 
 TEST(YUVConvertTest, DownScaleYUVToRGB32WithRect) {
   // Read YUV reference data from file.
-  FilePath yuv_url;
+  base::FilePath yuv_url;
   EXPECT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &yuv_url));
   yuv_url = yuv_url.Append(FILE_PATH_LITERAL("media"))
                    .Append(FILE_PATH_LITERAL("test"))
@@ -775,6 +775,7 @@ TEST(YUVConvertTest, FilterYUVRows_C_OutOfBounds) {
   }
 }
 
+#if defined(MEDIA_MMX_INTRINSICS_AVAILABLE)
 TEST(YUVConvertTest, FilterYUVRows_MMX_OutOfBounds) {
   base::CPU cpu;
   if (!cpu.has_mmx()) {
@@ -796,6 +797,7 @@ TEST(YUVConvertTest, FilterYUVRows_MMX_OutOfBounds) {
     EXPECT_EQ(0u, dst[i]);
   }
 }
+#endif  // defined(MEDIA_MMX_INTRINSICS_AVAILABLE)
 
 TEST(YUVConvertTest, FilterYUVRows_SSE2_OutOfBounds) {
   base::CPU cpu;
@@ -818,6 +820,7 @@ TEST(YUVConvertTest, FilterYUVRows_SSE2_OutOfBounds) {
   }
 }
 
+#if defined(MEDIA_MMX_INTRINSICS_AVAILABLE)
 TEST(YUVConvertTest, FilterYUVRows_MMX_UnalignedDestination) {
   base::CPU cpu;
   if (!cpu.has_mmx()) {
@@ -847,6 +850,7 @@ TEST(YUVConvertTest, FilterYUVRows_MMX_UnalignedDestination) {
 
   EXPECT_EQ(0, memcmp(dst_sample.get(), dst_ptr, 17));
 }
+#endif  // defined(MEDIA_MMX_INTRINSICS_AVAILABLE)
 
 TEST(YUVConvertTest, FilterYUVRows_SSE2_UnalignedDestination) {
   base::CPU cpu;