Make base::Timer sequence-friendly.

media/base/android/media_codec_loop.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_CODEC_LOOP_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_LOOP_H_
 
 #include <deque>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/single_thread_task_runner.h"
 #include "base/time/tick_clock.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "media/base/android/media_codec_bridge.h"
 #include "media/base/decode_status.h"
 #include "media/base/encryption_scheme.h"
 #include "media/base/media_export.h"
 #include "media/base/subsample_entry.h"
 
 // MediaCodecLoop is based on Android's MediaCodec API.
@@ skipping 69 matching lines @@
 //    (OnKeyAdded)
 //         |
 //      [Ready]
 //
 //     -[Any state]-
 //    |             |
 // (Flush ok) (Flush fails)
 //    |             |
 // [Ready]       [Error]
 
-namespace base {
-class SingleThreadTaskRunner;
-}
-
 namespace media {
 
 class MEDIA_EXPORT MediaCodecLoop {
  public:
   // TODO(liberato): this exists in video_decoder.h and audio_decoder.h too.
   using InitCB = base::Callback<void(bool success)>;
   using DecodeCB = base::Callback<void(DecodeStatus status)>;
 
   // Data that the client wants to put into an input buffer.
   struct InputData {
@@ skipping 72 matching lines @@
     // success, or false to transition to the error state.
     virtual bool OnOutputFormatChanged() = 0;
 
     // Notify the client when our state transitions to STATE_ERROR.
     virtual void OnCodecLoopError() = 0;
 
    protected:
     virtual ~Client() {}
   };
 
-  // We will take ownership of |media_codec|.  We will not destroy it until
-  // we are destructed.  |media_codec| may not be null.
-  // |sdk_level| is temporary.  It is used only to decouple MediaCodecLoop from
-  // BuildInfo, until we get BuildInfo into a mockable state.
+  // We will take ownership of |media_codec|.  We will not destroy it until we
+  // are destructed.  |media_codec| may not be null. |sdk_level| is temporary.
+  // It is used only to decouple MediaCodecLoop from BuildInfo, until we get
+  // BuildInfo into a mockable state. If |timer_task_runner| is non-null,
+  // timers are redirected to it.
   MediaCodecLoop(int sdk_level,
                  Client* client,
                  std::unique_ptr<MediaCodecBridge> media_codec,
-                 scoped_refptr<base::SingleThreadTaskRunner> =
-                     scoped_refptr<base::SingleThreadTaskRunner>());
+                 scoped_refptr<base::SingleThreadTaskRunner> timer_task_runner);
   ~MediaCodecLoop();
 
   // Optionally set the tick clock used for testing.  It is our caller's
   // responsibility to maintain ownership of this, since
   // FakeSingleThreadTaskRunner maintains a raw ptr to it also.
   void SetTestTickClock(base::TickClock* test_tick_clock);
 
   // Does the MediaCodec processing cycle: enqueues an input buffer, then
   // dequeues output buffers.  This should be called by the client when more
   // work becomes available, such as when new input data arrives.  If codec
@@ skipping 103 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaCodecLoop> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecLoop);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_LOOP_H_