Move //mojo/services/X/public/... to //mojo/services/X/... (part 2).

mojo/gpu/texture_uploader.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 "mojo/gpu/texture_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2extmojo.h>
 
-#include "mojo/services/geometry/public/cpp/geometry_util.h"
+#include "mojo/services/geometry/cpp/geometry_util.h"
 #include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
 
 namespace mojo {
 
 mojo::FramePtr TextureUploader::GetUploadFrame(
     base::WeakPtr<mojo::GLContext> context,
     uint32_t resource_id,
     const scoped_ptr<mojo::GLTexture>& texture) {
   if (!context) {
     return mojo::FramePtr();
@@ skipping 60 matching lines @@
 
   frame->resources.push_back(resource.Pass());
   quad->texture_quad_state = texture_state.Pass();
   pass->quads.push_back(quad.Pass());
 
   frame->passes.push_back(pass.Pass());
   return frame.Pass();
 }
 
 }  // namespace mojo