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

ui/surface/accelerated_surface_mac.cc

-// 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.
 
-#include "ui/gfx/surface/accelerated_surface_mac.h"
+#include "ui/surface/accelerated_surface_mac.h"
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_context.h"
 #include "ui/gfx/gl/gl_implementation.h"
 #include "ui/gfx/gl/gl_surface.h"
 #include "ui/gfx/gl/scoped_make_current.h"
 #include "ui/gfx/rect.h"
-#include "ui/gfx/surface/io_surface_support_mac.h"
+#include "ui/surface/io_surface_support_mac.h"
 
 AcceleratedSurface::AcceleratedSurface()
     : io_surface_id_(0),
       allocate_fbo_(false),
       texture_(0),
       fbo_(0) {
 }
 
 AcceleratedSurface::~AcceleratedSurface() {}
 
@@ skipping 328 matching lines @@
   }
   return transport_dib_->handle();
 }
 
 void AcceleratedSurface::SetTransportDIBAllocAndFree(
     const base::Callback<void(size_t, TransportDIB::Handle*)>& allocator,
     const base::Callback<void(TransportDIB::Id)>& deallocator) {
   dib_alloc_callback_ = allocator;
   dib_free_callback_ = deallocator;
 }