Bug 1213517 - split off MediaTaskUtils.h from MediaUtils.h to shed dependencies. r=jesup

MozReview-Commit-ID: DQz12SN0SU1

--HG--
rename : dom/media/systemservices/MediaUtils.h => dom/media/systemservices/MediaTaskUtils.h
extra : rebase_source : bd2b2a22b0bc5f92e071534bf13ef3a6880edbd9

dom/media/MediaManager.cpp

@@ -47,6 +47,7 @@
 #include "mozilla/Base64.h"
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/media/MediaChild.h"
+#include "mozilla/media/MediaTaskUtils.h"
 #include "MediaTrackConstraints.h"
 #include "VideoUtils.h"
 #include "Latency.h"

dom/media/systemservices/MediaTaskUtils.h

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set sw=2 ts=8 et ft=cpp : */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_MediaTaskUtils_h
+#define mozilla_MediaTaskUtils_h
+
+#include "nsThreadUtils.h"
+
+// The main reason this file is separate from MediaUtils.h
+#include "base/task.h"
+
+namespace mozilla {
+namespace media {
+
+/* media::NewTaskFrom() - Create a Task from a lambda.
+ *
+ * Similar to media::NewRunnableFrom() - Create an nsRunnable from a lambda.
+ */
+
+template<typename OnRunType>
+class LambdaTask : public Runnable
+{
+public:
+  explicit LambdaTask(OnRunType&& aOnRun) : mOnRun(Move(aOnRun)) {}
+private:
+  NS_IMETHOD
+  Run() override
+  {
+    mOnRun();
+    return NS_OK;
+  }
+  OnRunType mOnRun;
+};
+
+template<typename OnRunType>
+already_AddRefed<LambdaTask<OnRunType>>
+NewTaskFrom(OnRunType&& aOnRun)
+{
+  typedef LambdaTask<OnRunType> LambdaType;
+  RefPtr<LambdaType> lambda = new LambdaType(Forward<OnRunType>(aOnRun));
+  return lambda.forget();
+}
+
+} // namespace media
+} // namespace mozilla
+
+#endif // mozilla_MediaTaskUtils_h

dom/media/systemservices/MediaUtils.h

@@ -10,7 +10,6 @@
 #include "nsThreadUtils.h"
 #include "nsIAsyncShutdown.h"
 #include "mozilla/UniquePtr.h"
-#include "base/task.h"
 
 namespace mozilla {
 namespace media {
@@ -146,7 +145,6 @@ private:
 };
 
 /* media::NewRunnableFrom() - Create a Runnable from a lambda.
- * media::NewTaskFrom()     - Create a Task from a lambda.
  *
  * Passing variables (closures) to an async function is clunky with Runnable:
  *
@@ -207,30 +205,6 @@ NewRunnableFrom(OnRunType&& aOnRun)
   return lambda.forget();
 }
 
-template<typename OnRunType>
-class LambdaTask : public Runnable
-{
-public:
-  explicit LambdaTask(OnRunType&& aOnRun) : mOnRun(Move(aOnRun)) {}
-private:
-  NS_IMETHOD
-  Run() override
-  {
-    mOnRun();
-    return NS_OK;
-  }
-  OnRunType mOnRun;
-};
-
-template<typename OnRunType>
-already_AddRefed<LambdaTask<OnRunType>>
-NewTaskFrom(OnRunType&& aOnRun)
-{
-  typedef LambdaTask<OnRunType> LambdaType;
-  RefPtr<LambdaType> lambda = new LambdaType(Forward<OnRunType>(aOnRun));
-  return lambda.forget();
-}
-
 /* media::CoatCheck - There and back again. Park an object in exchange for an id.
  *
  * A common problem with calling asynchronous functions that do work on other

dom/media/systemservices/moz.build

@@ -71,6 +71,7 @@ EXPORTS.mozilla.media += ['MediaChild.h',
                           'MediaSystemResourceMessageUtils.h',
                           'MediaSystemResourceService.h',
                           'MediaSystemResourceTypes.h',
+                          'MediaTaskUtils.h',
                           'MediaUtils.h',
 ]
 UNIFIED_SOURCES += [