Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(255)

Side by Side Diff: media/base/android/media_codec_decoder_unittest.cc

Issue 1965273003: Fix include path for moved thread_task_runner_handle.h header in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/sounds/sounds_manager_unittest.cc ('k') | media/base/android/media_codec_player.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/threading/thread_task_runner_handle.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "media/base/android/audio_media_codec_decoder.h" 14 #include "media/base/android/audio_media_codec_decoder.h"
15 #include "media/base/android/media_codec_util.h" 15 #include "media/base/android/media_codec_util.h"
16 #include "media/base/android/media_statistics.h" 16 #include "media/base/android/media_statistics.h"
17 #include "media/base/android/sdk_media_codec_bridge.h" 17 #include "media/base/android/sdk_media_codec_bridge.h"
18 #include "media/base/android/test_data_factory.h" 18 #include "media/base/android/test_data_factory.h"
19 #include "media/base/android/test_statistics.h" 19 #include "media/base/android/test_statistics.h"
20 #include "media/base/android/video_media_codec_decoder.h" 20 #include "media/base/android/video_media_codec_decoder.h"
21 #include "media/base/timestamp_constants.h" 21 #include "media/base/timestamp_constants.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 754
755 EXPECT_TRUE(decoder_->IsStopped()); 755 EXPECT_TRUE(decoder_->IsStopped());
756 EXPECT_TRUE(decoder_->IsCompleted()); 756 EXPECT_TRUE(decoder_->IsCompleted());
757 EXPECT_EQ(data_factory_->last_pts(), pts_stat_.max()); 757 EXPECT_EQ(data_factory_->last_pts(), pts_stat_.max());
758 758
759 // Check that the reported video size is the one from the in-stream configs. 759 // Check that the reported video size is the one from the in-stream configs.
760 EXPECT_EQ(data_factory_->GetConfigs().video_size, video_size_); 760 EXPECT_EQ(data_factory_->GetConfigs().video_size, video_size_);
761 } 761 }
762 762
763 } // namespace media 763 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/sounds/sounds_manager_unittest.cc ('k') | media/base/android/media_codec_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698