[Mojo Video Capture] Split OnIncomingCapturedVideoFrame() to OnNewBuffer() and OnFrameReadyInBuffer(

media/capture/video/video_capture_device.cc

 // Copyright 2013 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/capture/video/video_capture_device.h"
 
 #include "base/command_line.h"
 #include "base/i18n/timezone.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "media/base/media_switches.h"
 
 namespace media {
 
-VideoCaptureDevice::Client::Buffer::Buffer() : id_(0), frame_feedback_id_(0) {}
+VideoCaptureDevice::Client::Buffer::Buffer() : id(0), frame_feedback_id(0) {}
 
 VideoCaptureDevice::Client::Buffer::Buffer(
     int buffer_id,
     int frame_feedback_id,
     std::unique_ptr<HandleProvider> handle_provider,
     std::unique_ptr<ScopedAccessPermission> access_permission)
-    : handle_provider_(std::move(handle_provider)),
-      access_permission_(std::move(access_permission)),
-      id_(buffer_id),
-      frame_feedback_id_(frame_feedback_id) {}
+    : id(buffer_id),
+      frame_feedback_id(frame_feedback_id),
+      handle_provider(std::move(handle_provider)),
+      access_permission(std::move(access_permission)) {}
 
 VideoCaptureDevice::Client::Buffer::Buffer(
     VideoCaptureDevice::Client::Buffer&& other) = default;
 
 VideoCaptureDevice::Client::Buffer::~Buffer() = default;
 
 VideoCaptureDevice::Client::Buffer& VideoCaptureDevice::Client::Buffer::
 operator=(VideoCaptureDevice::Client::Buffer&& other) = default;
 
 VideoCaptureDevice::~VideoCaptureDevice() {}
@@ skipping 32 matching lines @@
   switch (params.power_line_frequency) {
     case media::PowerLineFrequency::FREQUENCY_50HZ:  // fall through
     case media::PowerLineFrequency::FREQUENCY_60HZ:
       return params.power_line_frequency;
     default:
       return GetPowerLineFrequencyForLocation();
   }
 }
 
 }  // namespace media