Revert of Refactor content/common/gpu into gpu/ipc/service

content/common/gpu/image_transport_surface_android.cc

Index: content/common/gpu/image_transport_surface_android.cc
diff --git a/content/common/gpu/image_transport_surface_android.cc b/content/common/gpu/image_transport_surface_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..b8caac131dc625f36e624df18c8e171f05e3f07d
--- /dev/null
+++ b/content/common/gpu/image_transport_surface_android.cc
@@ -0,0 +1,41 @@
+// 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 "content/common/gpu/image_transport_surface.h"
+
+#include "base/logging.h"
+#include "content/common/gpu/pass_through_image_transport_surface.h"
+#include "gpu/ipc/common/gpu_surface_lookup.h"
+#include "ui/gl/gl_surface_egl.h"
+
+namespace content {
+
+// static
+scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface(
+    GpuChannelManager* manager,
+    GpuCommandBufferStub* stub,
+    gpu::SurfaceHandle surface_handle,
+    gfx::GLSurface::Format format) {
+  DCHECK(gpu::GpuSurfaceLookup::GetInstance());
+  DCHECK_NE(surface_handle, gpu::kNullSurfaceHandle);
+  // On Android, the surface_handle is the id of the surface in the
+  // GpuSurfaceTracker/gpu::GpuSurfaceLookup
+  ANativeWindow* window =
+      gpu::GpuSurfaceLookup::GetInstance()->AcquireNativeWidget(surface_handle);
+  if (!window) {
+    LOG(WARNING) << "Failed to acquire native widget.";
+    return nullptr;
+  }
+  scoped_refptr<gfx::GLSurface> surface =
+      new gfx::NativeViewGLSurfaceEGL(window);
+  bool initialize_success = surface->Initialize(format);
+  ANativeWindow_release(window);
+  if (!initialize_success)
+    return scoped_refptr<gfx::GLSurface>();
+
+  return scoped_refptr<gfx::GLSurface>(
+      new PassThroughImageTransportSurface(manager, stub, surface.get()));
+}
+
+}  // namespace content