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

Unified Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 2433233004: Use BrowserAssociatedInterface for mojo-loading (Closed)
Patch Set: fix Created 4 years, 2 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
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_blink_platform_impl.cc
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index 4dcd0d9b0a0264615ed9e723d20eae77b6d1e0ff..3ea9437961ce40fd8765b508fc131f8f5b4233d7 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -81,6 +81,7 @@
#include "media/blink/webcontentdecryptionmodule_impl.h"
#include "media/filters/stream_parser_factory.h"
#include "mojo/common/common_type_converters.h"
+#include "mojo/public/cpp/bindings/associated_group.h"
#include "services/service_manager/public/cpp/interface_provider.h"
#include "storage/common/database/database_identifier.h"
#include "storage/common/quota/quota_types.h"
@@ -308,13 +309,13 @@ void RendererBlinkPlatformImpl::Shutdown() {
//------------------------------------------------------------------------------
blink::WebURLLoader* RendererBlinkPlatformImpl::createURLLoader() {
- if (!url_loader_factory_)
- interfaceProvider()->getInterface(mojo::GetProxy(&url_loader_factory_));
ChildThreadImpl* child_thread = ChildThreadImpl::current();
+ if (!url_loader_factory_ && child_thread)
+ child_thread->channel()->GetRemoteAssociatedInterface(&url_loader_factory_);
// There may be no child thread in RenderViewTests. These tests can still use
// data URLs to bypass the ResourceDispatcher.
return new content::WebURLLoaderImpl(
- child_thread ? child_thread->resource_dispatcher() : NULL,
+ child_thread ? child_thread->resource_dispatcher() : nullptr,
url_loader_factory_.get());
}
« no previous file with comments | « content/renderer/renderer_blink_platform_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698