Restructure public side of surfaces service.

examples/bitmap_uploader/bitmap_uploader.cc

 // Copyright 2014 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 "examples/bitmap_uploader/bitmap_uploader.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif  // GL_GLEXT_PROTOTYPES
 
 #include "base/bind.h"
 #include "gpu/GLES2/gl2chromium.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "mojo/public/c/gles2/gles2.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/interfaces/application/shell.mojom.h"
 #include "mojo/services/public/cpp/geometry/geometry_util.h"
-#include "mojo/services/public/cpp/surfaces/surfaces_utils.h"
+#include "mojo/services/surfaces/public/cpp/surfaces_utils.h"
 #include "mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "ui/gfx/geometry/rect.h"
 
 #define TRANSPARENT_COLOR 0x00000000
 
 namespace mojo {
 
 namespace {
 void LostContext(void*) {
@@ skipping 237 matching lines @@
                0);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
   return texture;
 }
 
 uint32_t BitmapUploader::TextureFormat() {
   return format_ == BGRA ? GL_BGRA_EXT : GL_RGBA;
 }
 
 }  // namespace mojo