core_services: Add mojo:surfaces_service to core_services.

components/surfaces/display_impl.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 "components/surfaces/display_impl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
-#include "components/surfaces/context_provider_mojo.h"
+#include "components/surfaces/surfaces_context_provider.h"
 #include "components/surfaces/surfaces_output_surface.h"
 #include "components/surfaces/surfaces_scheduler.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 
 namespace surfaces {
 namespace {
 void CallCallback(const mojo::Closure& callback, cc::SurfaceDrawStatus status) {
   callback.Run();
 }
@@ skipping 19 matching lines @@
       viewport_parameter_listener.Pass(),
       base::Bind(&DisplayImpl::OnContextCreated, base::Unretained(this)));
 }
 
 void DisplayImpl::OnContextCreated(mojo::CommandBufferPtr gles2_client) {
   DCHECK(!display_);
 
   cc::RendererSettings settings;
   display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));
   scheduler_->AddDisplay(display_.get());
-  display_->Initialize(make_scoped_ptr(new mojo::DirectOutputSurface(
-      new mojo::ContextProviderMojo(gles2_client.PassMessagePipe()))));
+  display_->Initialize(make_scoped_ptr(new surfaces::DirectOutputSurface(
+      new surfaces::SurfacesContextProvider(gles2_client.PassMessagePipe()))));
 
   factory_.Create(cc_id_);
   display_->SetSurfaceId(cc_id_, 1.f);
   if (pending_frame_)
     Draw();
 }
 
 DisplayImpl::~DisplayImpl() {
   if (display_) {
     factory_.Destroy(cc_id_);
@@ skipping 67 matching lines @@
   DCHECK(returner_);
 
   mojo::Array<mojo::ReturnedResourcePtr> ret(resources.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     ret[i] = mojo::ReturnedResource::From(resources[i]);
   }
   returner_->ReturnResources(ret.Pass());
 }
 
 }  // namespace surfaces