From 420ca434b15c63d6a9491111d5adbfbeaf57afb4 Mon Sep 17 00:00:00 2001
From: "buildbot@webrtc.org"
 <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 26 Jun 2014 08:08:40 +0000
Subject: [PATCH] (Auto)update libjingle 69860953-> 70002228

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6542 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/media/webrtc/fakewebrtcvideoengine.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/talk/media/webrtc/fakewebrtcvideoengine.h b/talk/media/webrtc/fakewebrtcvideoengine.h
index 85c59d8386..528ada56b6 100644
--- a/talk/media/webrtc/fakewebrtcvideoengine.h
+++ b/talk/media/webrtc/fakewebrtcvideoengine.h
@@ -684,7 +684,11 @@ class FakeWebRtcVideoEngine
     channels_[channel]->overuse_observer_ = observer;
     return 0;
   }
+#ifdef USE_WEBRTC_DEV_BRANCH
+  WEBRTC_STUB(GetCpuOveruseMetrics, (int, webrtc::CpuOveruseMetrics*));
+#else
   WEBRTC_STUB(CpuOveruseMeasures, (int, int*, int*, int*, int*));
+#endif
   WEBRTC_FUNC(SetCpuOveruseOptions,
       (int channel, const webrtc::CpuOveruseOptions& options)) {
     WEBRTC_CHECK_CHANNEL(channel);