Update from https://crrev.com/306655

services/surfaces/surfaces_impl.cc

Index: services/surfaces/surfaces_impl.cc
diff --git a/services/surfaces/surfaces_impl.cc b/services/surfaces/surfaces_impl.cc
index 9cbe6dd38a4049edcdb04e76100c6c139af75190..7387f9ce2e66774a87b371e3dad1550a99744d74 100644
--- a/services/surfaces/surfaces_impl.cc
+++ b/services/surfaces/surfaces_impl.cc
@@ -44,7 +44,7 @@ void SurfacesImpl::CreateSurface(SurfaceIdPtr id, SizePtr size) {
     NOTREACHED();
     return;
   }
-  factory_.Create(id.To<cc::SurfaceId>(), size.To<gfx::Size>());
+  factory_.Create(id.To<cc::SurfaceId>());
 }
 
 void SurfacesImpl::SubmitFrame(SurfaceIdPtr id,
@@ -97,8 +97,9 @@ void SurfacesImpl::CreateGLES2BoundSurface(
     display_->Initialize(make_scoped_ptr(new DirectOutputSurface(
         new ContextProviderMojo(command_buffer_handle_.Pass()))));
   }
-  factory_.Create(cc_id, size.To<gfx::Size>());
-  display_->Resize(cc_id, size.To<gfx::Size>(), 1.f);
+  factory_.Create(cc_id);
+  display_->SetSurfaceId(cc_id, 1.f);
+  display_->Resize(size.To<gfx::Size>());
   parameter_listeners_.AddBinding(this, listener_request.Pass());
 }