Upgrade Pipeline::Start() NOTREACHED() back into a CHECK().

media/base/pipeline.cc

Index: media/base/pipeline.cc
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index a4bfd29bb2fef2c31d42751b6c9681735e925ca2..713dfb6159b8ebfb861b14f68e4a437f8cdf4ad3 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -110,10 +110,7 @@ void Pipeline::Start(scoped_ptr<FilterCollection> collection,
                      const PipelineStatusCB& error_cb,
                      const PipelineStatusCB& start_cb) {
   base::AutoLock auto_lock(lock_);
-  if (running_) {
-    NOTREACHED() << "Media pipeline is already running";
-    return;
-  }
+  CHECK(!running_) << "Media pipeline is already running";
 
   running_ = true;
   message_loop_->PostTask(FROM_HERE, base::Bind(
@@ -557,6 +554,9 @@ void Pipeline::StartTask(scoped_ptr<FilterCollection> filter_collection,
                          const PipelineStatusCB& start_cb) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(kCreated, state_);
+  if (state_ != kCreated)

[Ami GONE FROM CHROMIUM, 2012/08/15 18:04:38]

wat?

[Ami GONE FROM CHROMIUM, 2012/08/15 18:10:27]

Per offline convo, promote DCHECK above to CHECK, instead.

+    return;
+
   filter_collection_ = filter_collection.Pass();
   ended_cb_ = ended_cb;
   error_cb_ = error_cb;