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

ui/surface/accelerated_surface_mac.h

Index: ui/surface/accelerated_surface_mac.h
diff --git a/ui/gfx/surface/accelerated_surface_mac.h b/ui/surface/accelerated_surface_mac.h
similarity index 96%
rename from ui/gfx/surface/accelerated_surface_mac.h
rename to ui/surface/accelerated_surface_mac.h
index 7cf534b2d359d072cb2f204b4b1910ea5fe3655d..fc37640eaf3dbcdac57d63df2b99d0ad51ebf76d 100644
--- a/ui/gfx/surface/accelerated_surface_mac.h
+++ b/ui/surface/accelerated_surface_mac.h
@@ -1,9 +1,9 @@
-// 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>
@@ -16,8 +16,8 @@
 #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.
@@ -178,4 +178,4 @@ class SURFACE_EXPORT AcceleratedSurface {
   base::Callback<void(TransportDIB::Id)> dib_free_callback_;
 };
 
-#endif  // UI_GFX_SURFACE_ACCELERATED_SURFACE_MAC_H_
+#endif  // UI_SURFACE_ACCELERATED_SURFACE_MAC_H_