Media Session: prepare for implicit activation of user created session

components/html_viewer/html_frame.cc

 // Copyright 2015 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 "components/html_viewer/html_frame.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <limits>
 #include <utility>
@@ skipping 297 matching lines @@
     mus::ScopedWindowPtr::DeleteWindowOrWindowManager(window_);
   }
 }
 
 blink::WebMediaPlayer* HTMLFrame::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebMediaPlayerEncryptedMediaClient* encrypted_client,
     blink::WebContentDecryptionModule* initial_cdm,
-    const blink::WebString& sink_id) {
+    const blink::WebString& sink_id,
+    blink::WebMediaSession*) {

[jochen (gone - plz use gerrit), 2016/01/25 11:34:54]

same here

   return global_state()->media_factory()->CreateMediaPlayer(
       frame, url, client, encrypted_client, initial_cdm, GetApp()->shell());
 }
 
 blink::WebFrame* HTMLFrame::createChildFrame(
     blink::WebLocalFrame* parent,
     blink::WebTreeScopeType scope,
     const blink::WebString& frame_name,
     blink::WebSandboxFlags sandbox_flags,
     const blink::WebFrameOwnerProperties& frame_owner_properties) {
@@ skipping 710 matching lines @@
 
   if (!surface_layer_)
     return;
 
   surface_layer_->SetSurfaceId(cc::SurfaceId(owned_window_->window()->id()),
                                global_state()->device_pixel_ratio(),
                                owned_window_->window()->bounds().size());
 }
 
 }  // namespace mojo