Index: content/browser/browser_main_loop.cc |
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc |
index 70e5627c9c54af4e3ef414f62058feacb4189859..2366655cb56d6dc184c7e8971ae790ccfbe6dad0 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/gl/gl_surface.h" |
#endif |
@@ -675,13 +673,8 @@ void BrowserMainLoop::PostMainMessageLoopStart() { |
{ |
TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:SurfaceTextureManager"); |
tguilbert
2016/11/23 19:58:15
Any suggestions as to what this should be updated
|
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(); |
} |