Fix MediaRemoting MediaObserver

content/renderer/media/media_factory.cc

 // Copyright 2017 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 "content/renderer/media/media_factory.h"
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial_params.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 198 matching lines @@
   // a new player id which is used to collate logs on the browser side.
   std::unique_ptr<media::MediaLog> media_log(
       new RenderMediaLog(url::Origin(security_origin).GetURL()));
 
   base::WeakPtr<media::MediaObserver> media_observer;
 
   auto factory_selector =
       CreateRendererFactorySelector(media_log.get(), use_media_player_renderer,
                                     GetDecoderFactory(), &media_observer);
 
+#if BUILDFLAG(ENABLE_MEDIA_REMOTING)
+  DCHECK(media_observer);
+#endif
+
   if (!url_index_.get() || url_index_->frame() != web_frame)
     url_index_.reset(new media::UrlIndex(web_frame));
 
   std::unique_ptr<media::WebMediaPlayerParams> params(
       new media::WebMediaPlayerParams(
           std::move(media_log),
           base::Bind(&ContentRendererClient::DeferMediaLoad,
                      base::Unretained(GetContentClient()->renderer()),
                      static_cast<RenderFrame*>(render_frame_),
                      GetWebMediaPlayerDelegate()->has_played_media()),
@@ skipping 113 matching lines @@
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING)
   media::mojom::RemotingSourcePtr remoting_source;
   auto remoting_source_request = mojo::MakeRequest(&remoting_source);
   media::mojom::RemoterPtr remoter;
   GetRemoterFactory()->Create(std::move(remoting_source),
                               mojo::MakeRequest(&remoter));
   using RemotingController = media::remoting::RendererController;
   std::unique_ptr<RemotingController> remoting_controller(
       new RemotingController(new media::remoting::SharedSession(
           std::move(remoting_source_request), std::move(remoter))));
-  base::WeakPtr<media::MediaObserver> media_observer =
-      remoting_controller->GetWeakPtr();
+  *out_media_observer = remoting_controller->GetWeakPtr();
 
   auto courier_factory =
       base::MakeUnique<media::remoting::CourierRendererFactory>(
           std::move(remoting_controller));
 
   // base::Unretained is safe here because |factory_selector| owns
   // |courier_factory|.
   factory_selector->SetQueryIsRemotingActiveCB(
       base::Bind(&media::remoting::CourierRendererFactory::IsRemotingActive,
                  base::Unretained(courier_factory.get())));
@@ skipping 129 matching lines @@
     DCHECK(remote_interfaces_);
     media_interface_provider_.reset(
         new MediaInterfaceProvider(remote_interfaces_));
   }
 
   return media_interface_provider_.get();
 }
 #endif  // BUILDFLAG(ENABLE_MOJO_MEDIA)
 
 }  // namespace content