Share sky::PlatformImpl bettween sky_viewer and SkyShell

sky/shell/ui/engine.cc

 // Copyright 2015 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 "sky/shell/ui/engine.h"
 
 #include "base/bind.h"
+#include "mojo/public/cpp/application/connect.h"
 #include "sky/engine/public/platform/WebInputEvent.h"
 #include "sky/engine/public/web/Sky.h"
 #include "sky/engine/public/web/WebLocalFrame.h"
 #include "sky/engine/public/web/WebSettings.h"
 #include "sky/engine/public/web/WebView.h"
+#include "sky/services/platform/platform_impl.h"
 #include "sky/shell/ui/animator.h"
 #include "sky/shell/ui/input_event_converter.h"
-#include "sky/shell/ui/platform_impl.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 
 namespace sky {
 namespace shell {
 
 namespace {
 
 void ConfigureSettings(blink::WebSettings* settings) {
   settings->setDefaultFixedFontSize(13);
@@ skipping 13 matching lines @@
 
 Engine::~Engine() {
   if (web_view_)
     web_view_->close();
 }
 
 base::WeakPtr<Engine> Engine::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
-void Engine::Init(mojo::ScopedMessagePipeHandle service_provider) {
-  platform_impl_.reset(new PlatformImpl(
-      mojo::MakeProxy<mojo::ServiceProvider>(service_provider.Pass())));
+void Engine::Init(mojo::ScopedMessagePipeHandle service_provider_handle) {
+  mojo::ServiceProviderPtr service_provider =
+      mojo::MakeProxy<mojo::ServiceProvider>(service_provider_handle.Pass());
+  mojo::NetworkServicePtr network_service;
+  mojo::ConnectToService(service_provider.get(), &network_service);
+  platform_impl_.reset(new PlatformImpl(network_service.Pass()));
+
   blink::initialize(platform_impl_.get());
 }
 
 void Engine::BeginFrame(base::TimeTicks frame_time) {
   double frame_time_sec = (frame_time - base::TimeTicks()).InSecondsF();
   double deadline_sec = frame_time_sec;
   double interval_sec = 1.0 / 60;
   blink::WebBeginFrameArgs args(frame_time_sec, deadline_sec, interval_sec);
 
   web_view_->beginFrame(args);
@@ skipping 61 matching lines @@
 
 void Engine::initializeLayerTreeView() {
 }
 
 void Engine::scheduleVisualUpdate() {
   animator_->RequestFrame();
 }
 
 }  // namespace shell
 }  // namespace sky