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

chrome/renderer/nacl_desc_wrapper_chrome.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 "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/desc/nacl_desc_sync_socket.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
-#include "ui/gfx/surface/transport_dib.h"
+#include "ui/surface/transport_dib.h"
 
 namespace nacl {
 
 DescWrapper* DescWrapperFactory::ImportPepperSharedMemory(intptr_t shm_int,
                                                           size_t size) {
   base::SharedMemory* shm = reinterpret_cast<base::SharedMemory*>(shm_int);
 #if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_OPENBSD)
   return ImportShmHandle(shm->handle().fd, size);
 #elif defined(OS_WIN)
   return ImportShmHandle(shm->handle(), size);
@@ skipping 41 matching lines @@
   }
   ss_desc = NULL;  // DescWrapper takes ownership of ss_desc.
   return wrapper;
 
  cleanup:
   NaClDescSafeUnref(&ss_desc->base);
   return NULL;
 }
 
 }  // namespace nacl