Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d

1 files changed, 3 insertions, 2 deletions

diff --git a/media/base/serial_runner.h b/media/base/serial_runner.h
index a59c7753c9..ef4b5d7696 100644
--- a/media/base/serial_runner.h
+++ b/media/base/serial_runner.h
@@ -11,6 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "media/base/media_export.h"
 #include "media/base/pipeline_status.h"
 
 namespace base {
@@ -22,13 +23,13 @@ namespace media {
 // Runs a series of bound functions accepting Closures or PipelineStatusCB.
 // SerialRunner doesn't use regular Closure/PipelineStatusCBs as it late binds
 // the completion callback as the series progresses.
-class SerialRunner {
+class MEDIA_EXPORT SerialRunner {
  public:
   typedef base::Callback<void(const base::Closure&)> BoundClosure;
   typedef base::Callback<void(const PipelineStatusCB&)> BoundPipelineStatusCB;
 
   // Serial queue of bound functions to run.
-  class Queue {
+  class MEDIA_EXPORT Queue {
    public:
     Queue();
     ~Queue();