Almost done: ApplicationDelegate -> ApplicationImplBase conversion.

services/media/factory_service/media_player_impl.cc

 // Copyright 2016 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 "base/logging.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/services/media/common/cpp/timeline.h"
 #include "services/media/factory_service/media_player_impl.h"
 #include "services/media/framework/parts/reader.h"
 #include "services/media/framework/util/callback_joiner.h"
@@ skipping 20 matching lines @@
                                              uint64_t version) {
     MediaPlayerStatusPtr status = MediaPlayerStatus::New();
     status->timeline_transform = TimelineTransform::From(timeline_function_);
     status->end_of_stream = end_of_stream_;
     status->metadata = metadata_.Clone();
     callback.Run(version, status.Pass());
   });
 
   state_ = State::kWaiting;
 
-  ConnectToService(app()->shell(), "mojo:media_factory", GetProxy(&factory_));
+  ConnectToService(owner->shell(), "mojo:media_factory", GetProxy(&factory_));
 
   factory_->CreateDemux(reader.Pass(), GetProxy(&demux_));
   HandleDemuxMetadataUpdates();
 
   factory_->CreateTimelineController(GetProxy(&timeline_controller_));
   timeline_controller_->GetControlSite(GetProxy(&timeline_control_site_));
   timeline_control_site_->GetTimelineConsumer(GetProxy(&timeline_consumer_));
   HandleTimelineControlSiteStatusUpdates();
 
   demux_->Describe([this](mojo::Array<MediaTypePtr> stream_types) {
@@ skipping 238 matching lines @@
         HandleTimelineControlSiteStatusUpdates(version, status.Pass());
       });
 }
 
 MediaPlayerImpl::Stream::Stream() {}
 
 MediaPlayerImpl::Stream::~Stream() {}
 
 }  // namespace media
 }  // namespace mojo