Merge 21937 - Nice and easy fix for the media clock interpolating past the du...

media/base/mock_filters.h

Index: media/base/mock_filters.h
===================================================================
--- media/base/mock_filters.h	(revision 22806)
+++ media/base/mock_filters.h	(working copy)
@@ -336,6 +336,12 @@
   filter->host()->SetError(error);
 }
 
+// Helper gmock action that calls SetDuration() on behalf of the provided
+// filter.
+ACTION_P2(SetDuration, filter, duration) {
+  filter->host()->SetDuration(duration);
+}
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_MOCK_FILTERS_H_
Property changes on: media\base\mock_filters.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/media/base/mock_filters.h:r21937