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

mojo/gpu/texture_uploader_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.
 
 #include "mojo/gpu/texture_uploader.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/gpu/texture_cache.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/connect.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 TextureUploaderTest : public mojo::test::ApplicationTestBase {
  public:
   TextureUploaderTest() : surface_id_(1u), weak_factory_(this) {}
   ~TextureUploaderTest() override {}
 
   void SetUp() override {
@@ skipping 27 matching lines @@
   size.width = 100;
   size.height = 100;
   scoped_ptr<mojo::TextureCache::TextureInfo> texture_info(
       texture_cache_->GetTexture(size).Pass());
   mojo::FramePtr frame = mojo::TextureUploader::GetUploadFrame(
       gl_context_, texture_info->ResourceId(), texture_info->Texture());
   EXPECT_FALSE(frame.is_null());
 }
 
 }  // namespace