Index: content/common/gpu/media/video_decode_accelerator_unittest.cc |
=================================================================== |
--- content/common/gpu/media/video_decode_accelerator_unittest.cc (revision 120554) |
+++ content/common/gpu/media/video_decode_accelerator_unittest.cc (working copy) |
@@ -74,7 +74,7 @@ |
// - |profile| is the media::H264Profile set during Initialization. |
// An empty value for a numeric field means "ignore". |
const FilePath::CharType* test_video_data = |
- FILE_PATH_LITERAL("test-25fps.h264:320:240:250:258:50:175:1"); |
+ FILE_PATH_LITERAL("test-25fps.h264:1280:720:250:258:33:175:1"); |
Ami GONE FROM CHROMIUM
2012/03/14 17:21:59
You can't change this without providing a new test
|
// Parse |data| into its constituent parts and set the various output fields |
// accordingly. CHECK-fails on unexpected or missing required data. |
@@ -420,7 +420,7 @@ |
#else // OS_WIN |
void RenderingHelper::PlatformInitialize() { |
- CHECK(x_display_ = XOpenDisplay(NULL)); |
+ CHECK(x_display_ = base::MessagePumpForUI::GetDefaultXDisplay()); |
} |
void RenderingHelper::PlatformUnInitialize() { |