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

apps/moterm/gl_helper.h

 // 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.
 
 #ifndef APPS_MOTERM_GL_HELPER_H_
 #define APPS_MOTERM_GL_HELPER_H_
 
 #include <GLES2/gl2.h>
 #include <MGL/mgl_types.h>
 
 #include <deque>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
+#include "mojo/services/gpu/interfaces/gpu.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace mojo {
 class Shell;
 }
 
 // A class that helps with drawing surfaces using GL.
 class GlHelper : public mojo::ResourceReturner {
  public:
@@ skipping 132 matching lines @@
 
   uint32_t next_resource_id_;
   std::vector<TextureInfo> textures_pending_return_;
 
   base::WeakPtrFactory<GlHelper> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GlHelper);
 };
 
 #endif  // APPS_MOTERM_GL_HELPER_H_