Use local ids for Surfaces APIs that can only apply to local surfaces

services/native_viewport/native_viewport_impl.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 "services/native_viewport/native_viewport_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 19 matching lines @@
 
 }  // namespace
 
 NativeViewportImpl::NativeViewportImpl(mojo::ApplicationImpl* app,
                                        bool is_headless)
     : is_headless_(is_headless),
       widget_id_(0u),
       metrics_(mojo::ViewportMetrics::New()),
       waiting_for_event_ack_(false),
       weak_factory_(this) {
-  app->ConnectToService("mojo:surfaces_service", &surfaces_service_);
+  app->ConnectToService("mojo:surfaces_service", &surface_);
   // TODO(jamesr): Should be mojo_gpu_service
   app->ConnectToService("mojo:native_viewport_service", &gpu_service_);
 }
 
 NativeViewportImpl::~NativeViewportImpl() {
   // Destroy the NativeViewport early on as it may call us back during
   // destruction and we want to be in a known state.
   platform_viewport_.reset();
 }
 
@@ skipping 26 matching lines @@
   platform_viewport_->SetBounds(gfx::Rect(size.To<gfx::Size>()));
 }
 
 void NativeViewportImpl::SubmittedFrame(mojo::SurfaceIdPtr child_surface_id) {
   if (child_surface_id_.is_null()) {
     // If this is the first indication that the client will use surfaces,
     // initialize that system.
     // TODO(jamesr): When everything is converted to surfaces initialize this
     // eagerly.
     viewport_surface_.reset(new ViewportSurface(
-        surfaces_service_.get(), gpu_service_.get(),
-        metrics_->size.To<gfx::Size>(),
+        surface_.Pass(), gpu_service_.get(), metrics_->size.To<gfx::Size>(),
         child_surface_id.To<cc::SurfaceId>()));
     if (widget_id_)
       viewport_surface_->SetWidgetId(widget_id_);
   }
   child_surface_id_ = child_surface_id.To<cc::SurfaceId>();
   if (viewport_surface_)
     viewport_surface_->SetChildId(child_surface_id_);
 }
 
 void NativeViewportImpl::SetEventDispatcher(
@@ skipping 61 matching lines @@
   waiting_for_event_ack_ = false;
 }
 
 void NativeViewportImpl::ProcessOnMetricsChanged() {
   client()->OnMetricsChanged(metrics_.Clone());
   if (viewport_surface_)
     viewport_surface_->SetSize(metrics_->size.To<gfx::Size>());
 }
 
 }  // namespace native_viewport