| Index: content/child/blink_platform_impl.cc
|
| diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc
|
| index 86e22ad565885130419ba1724b03bd6c7af239e0..8249916fde8e91810b6cbed62d09bfc5e89340e3 100644
|
| --- a/content/child/blink_platform_impl.cc
|
| +++ b/content/child/blink_platform_impl.cc
|
| @@ -48,7 +48,10 @@
|
| #include "content/child/web_url_request_util.h"
|
| #include "content/child/worker_thread_registry.h"
|
| #include "content/public/common/content_client.h"
|
| +#include "content/public/common/service_manager_connection.h"
|
| #include "net/base/net_errors.h"
|
| +#include "services/service_manager/public/cpp/connector.h"
|
| +#include "services/service_manager/public/interfaces/connector.mojom.h"
|
| #include "third_party/WebKit/public/platform/WebData.h"
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
|
| @@ -813,6 +816,29 @@ bool BlinkPlatformImpl::databaseSetFileSize(
|
| return false;
|
| }
|
|
|
| +service_manager::mojom::blink::ConnectorPtr
|
| +BlinkPlatformImpl::serviceConnector() {
|
| + service_manager::mojom::blink::ConnectorPtr blink_ptr;
|
| + if (!ChildThreadImpl::current())
|
| + return blink_ptr;
|
| +
|
| + service_manager::mojom::ConnectorPtr chromium_ptr;
|
| + ChildThreadImpl::current()
|
| + ->GetServiceManagerConnection()
|
| + ->GetConnector()
|
| + ->BindRequest(mojo::GetProxy(&chromium_ptr));
|
| +
|
| + // Pass the pipe from |chromium_ptr| to |blink_ptr|.
|
| + service_manager::mojom::ConnectorPtrInfo chromium_ptr_info =
|
| + chromium_ptr.PassInterface();
|
| + DCHECK(chromium_ptr_info.is_valid());
|
| + blink_ptr.Bind(service_manager::mojom::blink::ConnectorPtrInfo(
|
| + chromium_ptr_info.PassHandle(), chromium_ptr_info.version()));
|
| + DCHECK(blink_ptr.is_bound());
|
| +
|
| + return blink_ptr;
|
| +}
|
| +
|
| blink::WebString BlinkPlatformImpl::signedPublicKeyAndChallengeString(
|
| unsigned key_size_index,
|
| const blink::WebString& challenge,
|
|
|