Restructure public side of geometry service.

examples/bitmap_uploader/bitmap_uploader.h

 // 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.
 
 #ifndef EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
 #define EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/c/gles2/gles2.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
 #include "mojo/services/public/interfaces/gpu/gpu.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
 
 namespace mojo {
 class Shell;
 class View;
 
 // BitmapUploader is useful if you want to draw a bitmap or color in a View.
@@ skipping 46 matching lines @@
   base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_;
 
   base::WeakPtrFactory<BitmapUploader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BitmapUploader);
 };
 
 }  // namespace mojo
 
 #endif  // EXAMPLES_BITMAP_UPLOADER_BITMAP_UPLOADER_H_