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

apps/moterm/gl_helper.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 "apps/moterm/gl_helper.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2extmojo.h>
 #include <MGL/mgl.h>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/task_runner.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.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"
 
 // Maximum number of (live) textures to keep around.
 const size_t kMaxTextures = 10;
 
 GlHelper::GlHelper(Client* client,
                    mojo::Shell* shell,
                    GLint texture_format,
                    bool flipped,
                    const mojo::Size& initial_size)
@@ skipping 286 matching lines @@
   textures_pending_return_.clear();
 
   // We're in a callback, so we can just call the client directly.
   client_->OnContextLost();
 }
 
 void GlHelper::SubmitFrameCallback(uint32_t frame_id) {
   // We're in a callback, so we can just call the client directly.
   client_->OnFrameDisplayed(frame_id);
 }