| OLD | NEW | 
|    1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2013 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 "media/gpu/android_video_decode_accelerator.h" |    5 #include "media/gpu/android_video_decode_accelerator.h" | 
|    6  |    6  | 
|    7 #include <stdint.h> |    7 #include <stdint.h> | 
|    8  |    8  | 
|    9 #include <memory> |    9 #include <memory> | 
|   10  |   10  | 
|   11 #include "base/android/jni_android.h" |   11 #include "base/android/jni_android.h" | 
|   12 #include "base/bind.h" |   12 #include "base/bind.h" | 
|   13 #include "base/logging.h" |   13 #include "base/logging.h" | 
|   14 #include "base/message_loop/message_loop.h" |   14 #include "base/message_loop/message_loop.h" | 
|   15 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" |   15 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h" | 
|   16 #include "media/base/android/media_codec_util.h" |   16 #include "media/base/android/media_codec_util.h" | 
|   17 #include "media/base/android/media_jni_registrar.h" |   17 #include "media/base/android/media_jni_registrar.h" | 
|   18 #include "media/gpu/android_copying_backing_strategy.h" |  | 
|   19 #include "media/gpu/android_video_decode_accelerator.h" |   18 #include "media/gpu/android_video_decode_accelerator.h" | 
|   20 #include "media/video/picture.h" |   19 #include "media/video/picture.h" | 
|   21 #include "media/video/video_decode_accelerator.h" |   20 #include "media/video/video_decode_accelerator.h" | 
|   22 #include "testing/gtest/include/gtest/gtest.h" |   21 #include "testing/gtest/include/gtest/gtest.h" | 
|   23 #include "ui/gl/android/surface_texture.h" |   22 #include "ui/gl/android/surface_texture.h" | 
|   24  |   23  | 
|   25 namespace { |   24 namespace { | 
|   26  |   25  | 
|   27 bool MockMakeContextCurrent() { |   26 bool MockMakeContextCurrent() { | 
|   28   return true; |   27   return true; | 
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  103     return; |  102     return; | 
|  104   EXPECT_TRUE(Configure(kCodecVP8)); |  103   EXPECT_TRUE(Configure(kCodecVP8)); | 
|  105 } |  104 } | 
|  106  |  105  | 
|  107 }  // namespace media |  106 }  // namespace media | 
|  108  |  107  | 
|  109 int main(int argc, char** argv) { |  108 int main(int argc, char** argv) { | 
|  110   testing::InitGoogleTest(&argc, argv); |  109   testing::InitGoogleTest(&argc, argv); | 
|  111   return RUN_ALL_TESTS(); |  110   return RUN_ALL_TESTS(); | 
|  112 } |  111 } | 
| OLD | NEW |