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

apps/moterm/gl_helper_unittest.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.
 
 // Note: This test depends on |GlHelper|, which depends on an implementation of
 // mojo:native_viewport_service and mojo:surfaces_service.
 
 #include "apps/moterm/gl_helper.h"
 
 #include <GLES2/gl2.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
-#include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
+#include "mojo/services/surfaces/interfaces/surface_id.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class GlHelperTest : public mojo::test::ApplicationTestBase,
                      public GlHelper::Client {
  public:
   GlHelperTest()
       : surface_id_changed_call_count_(0),
         on_frame_displayed_call_count_(0),
@@ skipping 131 matching lines @@
   EXPECT_EQ(surface_id.id_namespace, last_surface_id()->id_namespace);
   EXPECT_EQ(2u, on_frame_displayed_call_count());
   EXPECT_EQ(frame_id, last_frame_id());
 
   // An out-of-the-blue |MakeCurrent()| should work.
   gl_helper()->MakeCurrent();
   EXPECT_EQ(static_cast<GLenum>(GL_NO_ERROR), glGetError());
 }
 
 }  // namespace