Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Unified Diff: extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc

Issue 2132003002: [chrome.displaySource] Use InterfaceProvider instead of ServiceRegistry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Rebase Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
index 73581469f9f1c47dfefb2174b0b5bb81985a7261..02bf13813c140d4dd4cb6b90c4554276d6fdf7d5 100644
--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
@@ -7,7 +7,6 @@
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/task_runner_util.h"
-#include "content/public/common/service_registry.h"
#include "content/public/renderer/media_stream_utils.h"
#include "content/public/renderer/media_stream_video_sink.h"
#include "content/public/renderer/render_thread.h"
@@ -16,6 +15,7 @@
#include "extensions/renderer/api/display_source/wifi_display/wifi_display_elementary_stream_info.h"
#include "extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h"
#include "media/base/bind_to_current_loop.h"
+#include "services/shell/public/cpp/interface_provider.h"
namespace extensions {
@@ -86,11 +86,11 @@ WiFiDisplayMediaManager::WiFiDisplayMediaManager(
const blink::WebMediaStreamTrack& video_track,
const blink::WebMediaStreamTrack& audio_track,
const std::string& sink_ip_address,
- content::ServiceRegistry* service_registry,
+ shell::InterfaceProvider* interface_provider,
const ErrorCallback& error_callback)
: video_track_(video_track),
audio_track_(audio_track),
- service_registry_(service_registry),
+ interface_provider_(interface_provider),
sink_ip_address_(sink_ip_address),
player_(nullptr),
io_task_runner_(content::RenderThread::Get()->GetIOTaskRunner()),
@@ -99,7 +99,7 @@ WiFiDisplayMediaManager::WiFiDisplayMediaManager(
is_initialized_(false),
weak_factory_(this) {
DCHECK(!video_track.isNull() || !audio_track.isNull());
- DCHECK(service_registry_);
+ DCHECK(interface_provider_);
DCHECK(!error_callback_.is_null());
}
@@ -488,7 +488,7 @@ void WiFiDisplayMediaManager::RegisterMediaService(
void WiFiDisplayMediaManager::ConnectToRemoteService(
WiFiDisplayMediaServiceRequest request) {
DCHECK(content::RenderThread::Get());
- service_registry_->ConnectToRemoteService(std::move(request));
+ interface_provider_->GetInterface(std::move(request));
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698