Restructure public side of geometry service.

examples/ganesh_app/texture_uploader.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 "examples/ganesh_app/texture_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include "base/bind.h"
 #include "gpu/GLES2/gl2chromium.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "mojo/public/c/gles2/gles2.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
-#include "mojo/services/public/cpp/geometry/geometry_util.h"
+#include "mojo/services/geometry/public/cpp/geometry_util.h"
 #include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
 
 namespace examples {
 
 TextureUploader::Client::~Client() {
 }
 
 TextureUploader::TextureUploader(Client* client,
                                  mojo::Shell* shell,
                                  base::WeakPtr<mojo::GLContext> context)
@@ skipping 137 matching lines @@
                                                  uint32_t id_namespace) {
   surface_ = surface.Pass();
   surface_.set_client(this);
   id_namespace_ = id_namespace;
 
   if (pending_upload_)
     Upload(pending_upload_.Pass());
 }
 
 }  // namespace examples