| Index: content/browser/renderer_host/render_process_host_impl.cc
|
| diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
|
| index a38027cc24529f803c468f238dcb7f15812571f9..c9d37a1140f51f033de41f092d58d6ca57b75ca3 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.cc
|
| +++ b/content/browser/renderer_host/render_process_host_impl.cc
|
| @@ -138,7 +138,6 @@
|
| #include "ipc/ipc_switches.h"
|
| #include "media/base/media_switches.h"
|
| #include "mojo/common/common_type_converters.h"
|
| -#include "mojo/public/cpp/bindings/allocation_scope.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
| #include "ppapi/shared_impl/ppapi_switches.h"
|
| #include "third_party/skia/include/core/SkBitmap.h"
|
| @@ -2074,9 +2073,8 @@ void RenderProcessHostImpl::ConnectTo(
|
| mojo_activation_required_ = true;
|
| MaybeActivateMojo();
|
|
|
| - mojo::AllocationScope scope;
|
| - mojo_application_host_->shell_client()->AcceptConnection(service_name,
|
| - handle.Pass());
|
| + mojo_application_host_->shell_client()->AcceptConnection(
|
| + mojo::String::From(service_name), handle.Pass());
|
| }
|
|
|
| } // namespace content
|
|
|