ui: Move surface/ directory out of gfx/, up to ui/.

ui/surface/accelerated_surface_mac.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
-#ifndef UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
-#define UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
+#ifndef UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
+#define UI_SURFACE_ACCELERATED_SURFACE_MAC_H_
 #pragma once
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/callback.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/gpu_preference.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "ui/gfx/surface/surface_export.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/surface_export.h"
+#include "ui/surface/transport_dib.h"
 
 // Should not include GL headers in a header file. Forward declare these types
 // instead.
 typedef struct _CGLContextObject* CGLContextObj;
 typedef unsigned int GLenum;
 typedef unsigned int GLuint;
 
 namespace gfx {
 class Rect;
 }
@@ skipping 140 matching lines @@
   // the user requests an FBO be allocated.
   GLuint texture_;
   // The FBO and renderbuffer are only allocated if allocate_fbo_ is
   // true.
   GLuint fbo_;
   // Allocate a TransportDIB in the renderer.
   base::Callback<void(size_t, TransportDIB::Handle*)> dib_alloc_callback_;
   base::Callback<void(TransportDIB::Id)> dib_free_callback_;
 };
 
-#endif  // UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
+#endif  // UI_SURFACE_ACCELERATED_SURFACE_MAC_H_