Revert "media: CHECK DecryptingVideoDecoder::Reset() assumptions"

media/filters/decrypting_video_decoder.cc

 // Copyright (c) 2012 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.
 
 #include "media/filters/decrypting_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 97 matching lines @@
 }
 
 void DecryptingVideoDecoder::Reset(const base::Closure& closure) {
   DVLOG(2) << "Reset() - state: " << state_;
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(state_ == kIdle ||
          state_ == kPendingDecode ||
          state_ == kWaitingForKey ||
          state_ == kDecodeFinished ||
          state_ == kError) << state_;
+  DCHECK(init_cb_.is_null());  // No Reset() during pending initialization.
   DCHECK(reset_cb_.is_null());
 
   reset_cb_ = BindToCurrentLoop(closure);
 
-  // TODO(xhwang): These CHECKs are used to help investigate a bug. Remove them
-  // after the investigation is over. See http://crbug.com/695554
-  CHECK(state_ != kUninitialized);
-  CHECK(state_ != kPendingDecoderInit);
-  CHECK(init_cb_.is_null());  // No Reset() during pending initialization.
-
   decryptor_->ResetDecoder(Decryptor::kVideo);
 
   // Reset() cannot complete if the decode callback is still pending.
   // Defer the resetting process in this case. The |reset_cb_| will be fired
   // after the decode callback is fired - see DecryptAndDecodeBuffer() and
   // DeliverFrame().
   if (state_ == kPendingDecode) {
     DCHECK(!decode_cb_.is_null());
     return;
   }
@@ skipping 176 matching lines @@
 }
 
 void DecryptingVideoDecoder::DoReset() {
   DCHECK(init_cb_.is_null());
   DCHECK(decode_cb_.is_null());
   state_ = kIdle;
   base::ResetAndReturn(&reset_cb_).Run();
 }
 
 }  // namespace media