Add type argument to pepper content decryptor method GenerateKeyRequest().

webkit/plugins/ppapi/ppapi_plugin_instance.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 "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
@@ skipping 1599 matching lines @@
                                         const std::string& init_data) {
   if (!LoadContentDecryptorInterface())
     return false;
   if (key_system.empty())
     return false;
 
   PP_Var init_data_array =
       PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
           init_data.size(), init_data.data());
 
+  // TODO(tomfinegan): Add mime type argument to this method, and remove the
+  // hard coded mime type.
+  const std::string mime_type = "video/webm";

[ddorwin, 2012/10/26 18:37:06]

Let's just go with the empty string. CDMs will have to figure it out (or ignore
in the case of the current Clear Key implementation) for now.

[Tom Finegan, 2012/10/26 22:51:33]

Done.

   plugin_decryption_interface_->GenerateKeyRequest(
       pp_instance(),
       StringVar::StringToPPVar(key_system),
+      StringVar::StringToPPVar(mime_type),
       init_data_array);
   return true;
 }
 
 bool PluginInstance::AddKey(const std::string& session_id,
                             const std::string& key,
                             const std::string& init_data) {
   if (!LoadContentDecryptorInterface())
     return false;
   PP_Var key_array =
@@ skipping 1576 matching lines @@
   screen_size_for_fullscreen_ = gfx::Size();
   WebElement element = container_->element();
   element.setAttribute(WebString::fromUTF8(kWidth), width_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kHeight), height_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kBorder), border_before_fullscreen_);
   element.setAttribute(WebString::fromUTF8(kStyle), style_before_fullscreen_);
 }
 
 }  // namespace ppapi
 }  // namespace webkit