commit 55ac25781b90bbd67b7178a80bd6808a9107d01b
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jun 26 08:08:40 2014 +0000
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jun 26 08:08:40 2014 +0000
tree de48b7c5d04993281da5104dfaa2432d1d1956c7
parent 6eff6e06a8e4876a430c9af7d0d5753ba31599d9

(Auto)update libjingle 69860953-> 70002228

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@6542 4adac7df-926f-26a2-2b94-8c16560cd09d

media/webrtc/fakewebrtcvideoengine.h

diff --git a/media/webrtc/fakewebrtcvideoengine.h b/media/webrtc/fakewebrtcvideoengine.h
index 85c59d8..528ada5 100644
--- a/media/webrtc/fakewebrtcvideoengine.h
+++ b/media/webrtc/fakewebrtcvideoengine.h
@@ -684,7 +684,11 @@
     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);