Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7

1 files changed, 6 insertions, 0 deletions

diff --git a/media/base/media_log.h b/media/base/media_log.h
index 191de33b56..1d25c0973a 100644
--- a/media/base/media_log.h
+++ b/media/base/media_log.h
@@ -68,6 +68,12 @@ class MEDIA_EXPORT MediaLog : public base::RefCountedThreadSafe<MediaLog> {
   scoped_ptr<MediaLogEvent> CreateMediaSourceErrorEvent(
       const std::string& error);
 
+  // Report a property change without an accompanying event.
+  void SetStringProperty(const char* key, const std::string& value);
+  void SetIntegerProperty(const char* key, int value);
+  void SetDoubleProperty(const char* key, double value);
+  void SetBooleanProperty(const char* key, bool value);
+
  protected:
   friend class base::RefCountedThreadSafe<MediaLog>;
   virtual ~MediaLog();