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

Unified Diff: media/gpu/video_decode_accelerator_unittest.cc

Issue 2234753002: media: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/gpu/video_decode_accelerator_unittest.cc
diff --git a/media/gpu/video_decode_accelerator_unittest.cc b/media/gpu/video_decode_accelerator_unittest.cc
index 30ad9dec561f1875faef30a59e5397d0734a02de..70bc43996f40dc79e361813002f678384b261332 100644
--- a/media/gpu/video_decode_accelerator_unittest.cc
+++ b/media/gpu/video_decode_accelerator_unittest.cc
@@ -901,7 +901,7 @@ void GLRenderingVDAClient::DeleteDecoder() {
return;
weak_vda_ptr_factory_->InvalidateWeakPtrs();
decoder_.reset();
- STLClearObject(&encoded_data_);
+ base::STLClearObject(&encoded_data_);
active_textures_.clear();
// Cascade through the rest of the states to simplify test code below.
@@ -1118,8 +1118,9 @@ void VideoDecodeAcceleratorTest::SetUp() {
void VideoDecodeAcceleratorTest::TearDown() {
g_env->GetRenderingTaskRunner()->PostTask(
- FROM_HERE, base::Bind(&STLDeleteElements<std::vector<TestVideoFile*>>,
- &test_video_files_));
+ FROM_HERE,
+ base::Bind(&base::STLDeleteElements<std::vector<TestVideoFile*>>,
+ &test_video_files_));
base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED);
@@ -1487,11 +1488,11 @@ TEST_P(VideoDecodeAcceleratorParamTest, TestSimpleDecode) {
g_env->GetRenderingTaskRunner()->PostTask(
FROM_HERE,
- base::Bind(&STLDeleteElements<std::vector<GLRenderingVDAClient*>>,
+ base::Bind(&base::STLDeleteElements<std::vector<GLRenderingVDAClient*>>,
&clients));
g_env->GetRenderingTaskRunner()->PostTask(
FROM_HERE,
- base::Bind(&STLDeleteElements<
+ base::Bind(&base::STLDeleteElements<
std::vector<ClientStateNotification<ClientState>*>>,
&notes));
WaitUntilIdle();
« no previous file with comments | « media/gpu/ipc/service/gpu_jpeg_decode_accelerator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698