Remove SurfaceTextureManager

content/browser/browser_main_loop.cc

Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 86a5d31e2073c47e72ef333a56bdd18084e8d28e..8bfedeefa30e21c498d638f3c1bbb9a2c2d9ad92 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -113,14 +113,12 @@
 #include "base/android/jni_android.h"
 #include "components/tracing/common/graphics_memory_dump_provider_android.h"
 #include "content/browser/android/browser_startup_controller.h"
-#include "content/browser/android/browser_surface_texture_manager.h"
 #include "content/browser/android/scoped_surface_request_manager.h"
 #include "content/browser/android/tracing_controller_android.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/context_provider_factory_impl_android.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_android.h"
 #include "content/public/browser/screen_orientation_provider.h"
-#include "gpu/ipc/client/android/in_process_surface_texture_manager.h"
 #include "media/base/android/media_client_android.h"
 #include "ui/android/screen_android.h"
 #include "ui/display/screen.h"
@@ -677,13 +675,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() {
   {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager");

[tguilbert, 2016/12/01 22:46:50]

Carrying over this comment from Patch #1. Any suggestions as to how this should
be renamed?

[ncarter (slow), 2016/12/01 23:20:08]

"BrowserMainLoop::Subsystem:BrowserMediaPlayerManager"

I assume nobody cares about single-process when they are looking at tracing, so
just name it after what happens on line 681.

[tguilbert, 2016/12/02 00:01:52]

Sounds good. (Although, I will be deleting line 681 eventually. I will revisit
this problem then).

     if (parsed_command_line_.HasSwitch(switches::kSingleProcess)) {
-      gpu::SurfaceTextureManager::SetInstance(
-          gpu::InProcessSurfaceTextureManager::GetInstance());
       gpu::ScopedSurfaceRequestConduit::SetInstance(
           ScopedSurfaceRequestManager::GetInstance());
-    } else {
-      gpu::SurfaceTextureManager::SetInstance(
-          BrowserSurfaceTextureManager::GetInstance());
     }
     BrowserMediaPlayerManager::InitSurfaceTexturePeer();
   }