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

apps/moterm/gl_helper_test_app.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.
 
 // This is a test application for gl_helper.*, which draws directly to a native
 // viewport (without using the view manager).
 
 #include <GLES2/gl2.h>
 #include <math.h>
 
 #include "apps/moterm/gl_helper.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
-#include "mojo/services/gpu/public/interfaces/context_provider.mojom.h"
-#include "mojo/services/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/services/geometry/interfaces/geometry.mojom.h"
+#include "mojo/services/gpu/interfaces/context_provider.mojom.h"
+#include "mojo/services/native_viewport/interfaces/native_viewport.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/display.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/quads.mojom.h"
 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
 
 namespace {
 
 GLuint LoadShader(GLenum type, const char* shader_source) {
   GLuint shader = glCreateShader(type);
   CHECK(shader);
   glShaderSource(shader, 1, &shader_source, nullptr);
@@ skipping 238 matching lines @@
 };
 
 const GLuint GlHelperExampleApp::kPositionLocation;
 
 }  // namespace
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new GlHelperExampleApp());
   return runner.Run(application_request);
 }