Merge 22087 - Missing buffered attribute for <video>/<audio>...

media/base/mock_filters.h

Index: media/base/mock_filters.h
===================================================================
--- media/base/mock_filters.h	(revision 22821)
+++ media/base/mock_filters.h	(working copy)
@@ -342,6 +342,18 @@
   filter->host()->SetDuration(duration);
 }
 
+// Helper gmock action that calls SetTotalBytes() on behalf of the provided
+// filter.
+ACTION_P2(SetTotalBytes, filter, bytes) {
+  filter->host()->SetTotalBytes(bytes);
+}
+
+// Helper gmock action that calls SetBufferedBytes() on behalf of the provided
+// filter.
+ACTION_P2(SetBufferedBytes, filter, bytes) {
+  filter->host()->SetBufferedBytes(bytes);
+}
+
 }  // 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:r22087