Remove incorrect promise resolving type handling.

content/renderer/pepper/content_decryptor_delegate.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 "content/renderer/pepper/content_decryptor_delegate.h"
 
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/sparse_histogram.h"
@@ skipping 677 matching lines @@
 
   // TODO(tomfinegan): Need to get stream type from media stack.
   ScopedPPResource pp_resource(encrypted_resource.get());
   plugin_decryption_interface_->DecryptAndDecode(
       pp_instance_, PP_DECRYPTORSTREAMTYPE_VIDEO, pp_resource, &block_info);
   return true;
 }
 
 void ContentDecryptorDelegate::OnPromiseResolved(uint32 promise_id) {
   scoped_ptr<CdmPromise> promise = TakePromise(promise_id);
-
-  // Special case due to http://crbug.com/408330. CDM is resolving LoadSession()
-  // with this method when the session is not found. Instead it should call
-  // PromiseResolvedWithSession(""), so emulate that here until 408330 is fixed.
-  // TODO(jrummell): Remove this code when the CDM is updated.
-  if (promise &&
-      promise->GetResolveParameterType() == media::CdmPromise::STRING_TYPE) {
-    NewSessionCdmPromise* session_promise =
-        static_cast<NewSessionCdmPromise*>(promise.get());
-    session_promise->resolve(std::string());
-    return;
-  }
-
   if (!promise ||
       promise->GetResolveParameterType() != media::CdmPromise::VOID_TYPE) {
     NOTREACHED();
     return;
   }
 
   SimpleCdmPromise* simple_promise =
       static_cast<SimpleCdmPromise*>(promise.get());
   simple_promise->resolve();
 }
@@ skipping 597 matching lines @@
 
 scoped_ptr<CdmPromise> ContentDecryptorDelegate::TakePromise(
     uint32_t promise_id) {
   PromiseMap::iterator it = promises_.find(promise_id);
   if (it == promises_.end())
     return scoped_ptr<CdmPromise>();
   return promises_.take_and_erase(it);
 }
 
 }  // namespace content