Changes to support CDM_7

media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

 // Copyright 2013 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/cdm/ppapi/external_clear_key/clear_key_cdm.h"
 
 #include <algorithm>
 #include <cstring>
 #include <sstream>
 #include <string>
@@ skipping 138 matching lines @@
     case media::MediaKeys::OUTPUT_ERROR:
       return cdm::kOutputError;
   }
   NOTIMPLEMENTED();
   return cdm::kUnknownError;
 }
 
 static media::MediaKeys::SessionType ConvertSessionType(
     cdm::SessionType session_type) {
   switch (session_type) {
-    case cdm::kPersistent:
+    case cdm::kPersistentLicense:
+    case cdm::kPersistentKeyRelease:

[ddorwin, 2014/12/17 01:01:15]

TODO.

It might be better to have a separate return statement  so we can see which is
incorrect. At some point, we should reorder these to be in enum value.

[jrummell, 2014/12/17 19:17:19]

Done.

       return media::MediaKeys::PERSISTENT_SESSION;
     case cdm::kTemporary:
       return media::MediaKeys::TEMPORARY_SESSION;
   }
   NOTIMPLEMENTED();
   return media::MediaKeys::TEMPORARY_SESSION;
 }
 
 template<typename Type>
 class ScopedResetter {
@@ skipping 688 matching lines @@
   host_->OnSessionMessage(last_session_id_.data(),
                           last_session_id_.length(),
                           message.data(),
                           message.length(),
                           NULL,
                           0);
   file_io_test_runner_.reset();
 }
 
 }  // namespace media