Teach the native viewport service to draw a Surface into itself

mojo/shell/context.cc

 // Copyright 2013 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 "mojo/shell/context.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 123 matching lines @@
   virtual bool ConfigureIncomingConnection(
       mojo::ApplicationConnection* connection) OVERRIDE {
     connection->AddService<NativeViewport>(this);
     connection->AddService<Gpu>(this);
     return true;
   }
 
   // InterfaceFactory<NativeViewport> implementation.
   virtual void Create(ApplicationConnection* connection,
                       InterfaceRequest<NativeViewport> request) OVERRIDE {
-    BindToRequest(new NativeViewportImpl, &request);
+    SurfacesServicePtr surfaces_service;
+    app_->ConnectToService("mojo:mojo_surfaces_service", &surfaces_service);
+    GpuPtr gpu_service;
+    // TODO(jamesr): Should be mojo_gpu_service
+    app_->ConnectToService("mojo:mojo_native_viewport_service", &gpu_service);
+    BindToRequest(
+        new NativeViewportImpl(surfaces_service.Pass(), gpu_service.Pass()),
+        &request);
   }
 
   // InterfaceFactory<Gpu> implementation.
   virtual void Create(ApplicationConnection* connection,
                       InterfaceRequest<Gpu> request) OVERRIDE {
     BindToRequest(new GpuImpl(share_group_.get(), mailbox_manager_.get()),
                   &request);
   }
 
   scoped_refptr<gfx::GLShareGroup> share_group_;
@@ skipping 107 matching lines @@
 ScopedMessagePipeHandle Context::ConnectToServiceByName(
     const GURL& application_url,
     const std::string& service_name) {
   app_urls_.insert(application_url);
   return application_manager_.ConnectToServiceByName(
       application_url, service_name).Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo