Rename SharedRendererState to RenderThreadManager

android_webview/android_webview.gyp

Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index f0cd0e032d789540931c373149a87fcb0380bb61..0ac4b8650ff362496be6e70444166ec6893bf5c1 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -282,10 +282,10 @@
         'browser/aw_browser_permission_request_delegate.h',
         'browser/aw_browser_policy_connector.cc',
         'browser/aw_browser_policy_connector.h',
-        'browser/aw_contents_client_bridge_base.cc',
-        'browser/aw_contents_client_bridge_base.h',
         'browser/aw_content_browser_client.cc',
         'browser/aw_content_browser_client.h',
+        'browser/aw_contents_client_bridge_base.cc',
+        'browser/aw_contents_client_bridge_base.h',
         'browser/aw_contents_io_thread_client.h',
         'browser/aw_cookie_access_policy.cc',
         'browser/aw_cookie_access_policy.h',
@@ -309,8 +309,8 @@
         'browser/aw_message_port_message_filter.cc',
         'browser/aw_message_port_message_filter.h',
         'browser/aw_message_port_service.h',
-        'browser/aw_metrics_service_client.h',
         'browser/aw_metrics_service_client.cc',
+        'browser/aw_metrics_service_client.h',
         'browser/aw_permission_manager.cc',
         'browser/aw_permission_manager.h',
         'browser/aw_pref_store.cc',
@@ -327,9 +327,9 @@
         'browser/aw_render_thread_context_provider.h',
         'browser/aw_resource_context.cc',
         'browser/aw_resource_context.h',
+        'browser/aw_result_codes.h',
         'browser/aw_ssl_host_state_delegate.cc',
         'browser/aw_ssl_host_state_delegate.h',
-        'browser/aw_result_codes.h',
         'browser/aw_web_preferences_populater.cc',
         'browser/aw_web_preferences_populater.h',
         'browser/browser_view_renderer.cc',
@@ -341,20 +341,20 @@
         'browser/deferred_gpu_command_service.h',
         'browser/find_helper.cc',
         'browser/find_helper.h',
+        'browser/gl_view_renderer_manager.cc',
+        'browser/gl_view_renderer_manager.h',
         'browser/hardware_renderer.cc',
         'browser/hardware_renderer.h',
         'browser/icon_helper.cc',
         'browser/icon_helper.h',
         'browser/input_stream.h',
         'browser/jni_dependency_factory.h',
-        'browser/gl_view_renderer_manager.cc',
-        'browser/gl_view_renderer_manager.h',
         'browser/net/android_stream_reader_url_request_job.cc',
         'browser/net/android_stream_reader_url_request_job.h',
         'browser/net/aw_cookie_store_wrapper.cc',
         'browser/net/aw_cookie_store_wrapper.h',
-        'browser/net/aw_http_user_agent_settings.h',
         'browser/net/aw_http_user_agent_settings.cc',
+        'browser/net/aw_http_user_agent_settings.h',
         'browser/net/aw_network_change_notifier.cc',
         'browser/net/aw_network_change_notifier.h',
         'browser/net/aw_network_change_notifier_factory.cc',
@@ -379,6 +379,8 @@
         'browser/parent_compositor_draw_constraints.h',
         'browser/parent_output_surface.cc',
         'browser/parent_output_surface.h',
+        'browser/render_thread_manager.cc',
+        'browser/render_thread_manager.h',
         'browser/renderer_host/aw_render_view_host_ext.cc',
         'browser/renderer_host/aw_render_view_host_ext.h',
         'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc',
@@ -386,8 +388,6 @@
         'browser/scoped_allow_wait_for_legacy_web_view_api.h',
         'browser/scoped_app_gl_state_restore.cc',
         'browser/scoped_app_gl_state_restore.h',
-        'browser/shared_renderer_state.cc',
-        'browser/shared_renderer_state.h',
         'common/android_webview_message_generator.cc',
         'common/android_webview_message_generator.h',
         'common/aw_content_client.cc',
@@ -423,10 +423,10 @@
         'renderer/aw_message_port_client.h',
         'renderer/aw_print_web_view_helper_delegate.cc',
         'renderer/aw_print_web_view_helper_delegate.h',
-        'renderer/aw_render_process_observer.cc',
-        'renderer/aw_render_process_observer.h',
         'renderer/aw_render_frame_ext.cc',
         'renderer/aw_render_frame_ext.h',
+        'renderer/aw_render_process_observer.cc',
+        'renderer/aw_render_process_observer.h',
         'renderer/aw_render_view_ext.cc',
         'renderer/aw_render_view_ext.h',
         'renderer/print_render_frame_observer.cc',