Sky should expose services provided to/by embedder

sky/viewer/document_view.cc

 // Copyright 2014 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/viewer/document_view.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 109 matching lines @@
     root_->RemoveObserver(this);
   ui::GestureRecognizer::Get()->CleanupStateForConsumer(this);
 }
 
 base::WeakPtr<DocumentView> DocumentView::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void DocumentView::OnEmbed(
     mojo::View* root,
-    mojo::InterfaceRequest<mojo::ServiceProvider> services,
-    mojo::ServiceProviderPtr exposed_services) {
+    mojo::InterfaceRequest<mojo::ServiceProvider> services_provided_to_embedder,
+    mojo::ServiceProviderPtr embedder_provided_services) {
   root_ = root;
-  imported_services_ = exposed_services.Pass();
-  navigator_host_.set_service_provider(imported_services_.get());
+
+  mojo::ConnectToService(embedder_provided_services.get(), &navigator_host_);
+  mojo::ConnectToService(embedder_provided_services.get(), &test_harness_);
+
+  services_provided_to_embedder_ = services_provided_to_embedder.Pass();
+  embedder_provided_services_ = embedder_provided_services.Pass();
 
   Load(response_.Pass());
 
   UpdateRootSizeAndViewportMetrics(root_->bounds());
 
   // TODO(abarth): We should ask the view whether it is focused instead of
   // assuming that we're focused.
   web_view_->setFocus(true);
   root_->AddObserver(this);
 }
@@ skipping 26 matching lines @@
   bitmap_rasterizer_ = new RasterizerBitmap(layer_host_.get());
   return make_scoped_ptr(bitmap_rasterizer_);
 }
 
 void DocumentView::GetPixelsForTesting(std::vector<unsigned char>* pixels) {
   DCHECK(RuntimeFlags::Get().testing()) << "Requires testing runtime flag";
   DCHECK(root_layer_) << "The root layer owns the rasterizer";
   return bitmap_rasterizer_->GetPixelsForTesting(pixels);
 }
 
+TestHarnessPtr DocumentView::TakeTestHarness() {
+  return test_harness_.Pass();
+}
+
+mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedToEmbedder() {
+  return services_provided_to_embedder_.PassMessagePipe();
+}
+
+mojo::ScopedMessagePipeHandle DocumentView::TakeServicesProvidedByEmbedder() {
+  return embedder_provided_services_.PassMessagePipe();
+}
+
 mojo::Shell* DocumentView::GetShell() {
   return shell_;
 }
 
 void DocumentView::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 web_begin_frame_args(
       frame_time_sec, deadline_sec, interval_sec);
@@ skipping 147 matching lines @@
       }
     }
   }
 }
 
 void DocumentView::StartDebuggerInspectorBackend() {
   // FIXME: Do we need this for dart?
 }
 
 }  // namespace sky