media: Remove suffix underscores from public member variables in AVDA

media/gpu/avda_codec_allocator.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/gpu/avda_codec_allocator.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 222 matching lines @@
       pending_codec_releases_.find(surface_id)->second;
   released.TimedWait(base::TimeDelta::FromSeconds(2));
   if (!released.IsSignaled())
     DLOG(WARNING) << __func__ << ": timed out waiting for MediaCodec#release()";
 }
 
 std::unique_ptr<VideoCodecBridge> AVDACodecAllocator::CreateMediaCodecSync(
     scoped_refptr<CodecConfig> codec_config) {
   TRACE_EVENT0("media", "AVDA::CreateMediaCodecSync");
 
-  jobject media_crypto = codec_config->media_crypto_
-                             ? codec_config->media_crypto_->obj()
-                             : nullptr;
+  jobject media_crypto =
+      codec_config->media_crypto ? codec_config->media_crypto->obj() : nullptr;
 
-  // |needs_protected_surface_| implies encrypted stream.
-  DCHECK(!codec_config->needs_protected_surface_ || media_crypto);
+  // |needs_protected_surface| implies encrypted stream.
+  DCHECK(!codec_config->needs_protected_surface || media_crypto);
 
-  const bool require_software_codec = codec_config->task_type_ == SW_CODEC;
-
+  const bool require_software_codec = codec_config->task_type == SW_CODEC;
   std::unique_ptr<VideoCodecBridge> codec(VideoCodecBridge::CreateDecoder(
-      codec_config->codec_, codec_config->needs_protected_surface_,
-      codec_config->initial_expected_coded_size_,
-      codec_config->surface_.j_surface().obj(), media_crypto,
-      codec_config->csd0_, codec_config->csd1_, true, require_software_codec));
+      codec_config->codec, codec_config->needs_protected_surface,
+      codec_config->initial_expected_coded_size,
+      codec_config->surface.j_surface().obj(), media_crypto, codec_config->csd0,
+      codec_config->csd1, true, require_software_codec));
 
   return codec;
 }
 
 void AVDACodecAllocator::CreateMediaCodecAsync(
     base::WeakPtr<AVDACodecAllocatorClient> client,
     scoped_refptr<CodecConfig> codec_config) {
   base::PostTaskAndReplyWithResult(
-      TaskRunnerFor(codec_config->task_type_).get(), FROM_HERE,
+      TaskRunnerFor(codec_config->task_type).get(), FROM_HERE,
       base::Bind(&AVDACodecAllocator::CreateMediaCodecSync,
                  base::Unretained(this), codec_config),
       base::Bind(&AVDACodecAllocatorClient::OnCodecConfigured, client));
 }
 
 void AVDACodecAllocator::ReleaseMediaCodec(
     std::unique_ptr<VideoCodecBridge> media_codec,
     TaskType task_type,
     int surface_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 86 matching lines @@
 void AVDACodecAllocator::StopThreadTask(size_t index) {
   threads_[index]->thread.Stop();
   // Signal the stop event after both threads are stopped.
   if (stop_event_for_testing_ && !threads_[AUTO_CODEC]->thread.IsRunning() &&
       !threads_[SW_CODEC]->thread.IsRunning()) {
     stop_event_for_testing_->Signal();
   }
 }
 
 }  // namespace media