Remove SurfaceTextureManager

gpu/ipc/service/gpu_memory_buffer_factory_test_template.h

Index: gpu/ipc/service/gpu_memory_buffer_factory_test_template.h
diff --git a/gpu/ipc/service/gpu_memory_buffer_factory_test_template.h b/gpu/ipc/service/gpu_memory_buffer_factory_test_template.h
index 4c958f2c440e936f9e4c3c1b8ba285765483b185..0af2d6e80bd0c9363a8436d0339d2964a0e40302 100644
--- a/gpu/ipc/service/gpu_memory_buffer_factory_test_template.h
+++ b/gpu/ipc/service/gpu_memory_buffer_factory_test_template.h
@@ -8,14 +8,6 @@
 #ifndef GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_
 #define GPU_IPC_SERVICE_GPU_MEMORY_BUFFER_FACTORY_TEST_TEMPLATE_H_
 
-#if defined(OS_ANDROID)
-// TODO(markdittmer): Service code shouldn't depend on client code.
-// See crbug.com/608800.
-#include "gpu/ipc/client/android/in_process_surface_texture_manager.h"
-
-#include "gpu/ipc/common/android/surface_texture_manager.h"
-#endif
-
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -32,11 +24,6 @@ class GpuMemoryBufferFactoryTest : public testing::Test {
 TYPED_TEST_CASE_P(GpuMemoryBufferFactoryTest);
 
 TYPED_TEST_P(GpuMemoryBufferFactoryTest, CreateGpuMemoryBuffer) {
-#if defined(OS_ANDROID)
-  SurfaceTextureManager::SetInstance(
-      InProcessSurfaceTextureManager::GetInstance());
-#endif
-
   const gfx::GpuMemoryBufferId kBufferId(1);
   const int kClientId = 1;