Update mojo for changes to createMediaPlayer()

mojo/services/html_viewer/html_document_view.cc

 // Copyright 2014 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 "mojo/services/html_viewer/html_document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 162 matching lines @@
   return web_layer_tree_view_impl_.get();
 }
 
 blink::WebMediaPlayer* HTMLDocumentView::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client) {
   return web_media_player_factory_->CreateMediaPlayer(frame, url, client);
 }
 
+blink::WebMediaPlayer* HTMLDocumentView::createMediaPlayer(
+    blink::WebLocalFrame* frame,
+    const blink::WebURL& url,
+    blink::WebMediaPlayerClient* client,
+    blink::WebContentDecryptionModule* initial_cdm) {
+  return createMediaPlayer(frame, url, client);

[ddorwin, 2014/09/25 00:56:52]

Really, the factory should be updated to accept initial_cdm. This should be
pretty straightforward since this just ends up creating a WMPI.

You can do this when you remove the old signature above.

+}
+
 blink::WebFrame* HTMLDocumentView::createChildFrame(
     blink::WebLocalFrame* parent,
     const blink::WebString& frameName) {
   blink::WebLocalFrame* web_frame = blink::WebLocalFrame::create(this);
   parent->appendChild(web_frame);
   return web_frame;
 }
 
 void HTMLDocumentView::frameDetached(blink::WebFrame* frame) {
   if (frame->parent())
@@ skipping 50 matching lines @@
 }
 
 void HTMLDocumentView::OnViewInputEvent(View* view, const EventPtr& event) {
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent> >();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace mojo