From d51bcffc1e637f349b12a09a32d0ec370486fe06 Mon Sep 17 00:00:00 2001
From: "mflodman@webrtc.org"
 <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 2 Sep 2013 12:45:09 +0000
Subject: [PATCH] Function name change.

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4655 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/video_engine/vie_capturer.cc | 4 ++--
 webrtc/video_engine/vie_capturer.h  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/webrtc/video_engine/vie_capturer.cc b/webrtc/video_engine/vie_capturer.cc
index 8629a1cd8..dc0a946d2 100644
--- a/webrtc/video_engine/vie_capturer.cc
+++ b/webrtc/video_engine/vie_capturer.cc
@@ -511,7 +511,7 @@ bool ViECapturer::ViECaptureThreadFunction(void* obj) {
 bool ViECapturer::ViECaptureProcess() {
   if (capture_event_.Wait(kThreadWaitTimeMs) == kEventSignaled) {
     deliver_cs_->Enter();
-    if (MaybeSwapCapturedToDeliverFrame()) {
+    if (MaybeSwapCapturedAndDeliverFrame()) {
       DeliverI420Frame(&deliver_frame_);
     }
     deliver_cs_->Leave();
@@ -646,7 +646,7 @@ void ViECapturer::OnNoPictureAlarm(const int32_t id,
   observer_->NoPictureAlarm(id, vie_alarm);
 }
 
-bool ViECapturer::MaybeSwapCapturedToDeliverFrame() {
+bool ViECapturer::MaybeSwapCapturedAndDeliverFrame() {
   CriticalSectionScoped cs(capture_cs_.get());
   if (captured_frame_.IsZeroSize())
     return false;
diff --git a/webrtc/video_engine/vie_capturer.h b/webrtc/video_engine/vie_capturer.h
index db12a59a8..852397217 100644
--- a/webrtc/video_engine/vie_capturer.h
+++ b/webrtc/video_engine/vie_capturer.h
@@ -144,7 +144,7 @@ class ViECapturer
   void DeliverCodedFrame(VideoFrame* video_frame);
 
  private:
-  bool MaybeSwapCapturedToDeliverFrame();
+  bool MaybeSwapCapturedAndDeliverFrame();
 
   // Never take capture_cs_ before deliver_cs_!
   scoped_ptr<CriticalSectionWrapper> capture_cs_;