Eliminate BaseSessionServiceDelegateImpl

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8f43737a53b66b64fe940718ef8b2c23e2e48968..73da95ec65c5ae391a2116731214404097eca2f3 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -612,20 +612,20 @@
       'browser/media/media_device_id_salt.h',
       'browser/media/media_permission.cc',
       'browser/media/media_permission.h',
-      'browser/media/media_stream_capture_indicator.cc',
-      'browser/media/media_stream_capture_indicator.h',
-      'browser/media/media_stream_device_permissions.cc',
-      'browser/media/media_stream_device_permissions.h',
       'browser/media/media_stream_camera_permission_context_factory.cc',
       'browser/media/media_stream_camera_permission_context_factory.h',
+      'browser/media/media_stream_capture_indicator.cc',
+      'browser/media/media_stream_capture_indicator.h',
       'browser/media/media_stream_device_permission_context.cc',
       'browser/media/media_stream_device_permission_context.h',
-      'browser/media/media_stream_mic_permission_context_factory.cc',
-      'browser/media/media_stream_mic_permission_context_factory.h',
+      'browser/media/media_stream_device_permissions.cc',
+      'browser/media/media_stream_device_permissions.h',
       'browser/media/media_stream_devices_controller.cc',
       'browser/media/media_stream_devices_controller.h',
       'browser/media/media_stream_infobar_delegate.cc',
       'browser/media/media_stream_infobar_delegate.h',
+      'browser/media/media_stream_mic_permission_context_factory.cc',
+      'browser/media/media_stream_mic_permission_context_factory.h',
       'browser/media/media_url_constants.cc',
       'browser/media/media_url_constants.h',
       'browser/media/midi_permission_context.cc',
@@ -2635,10 +2635,10 @@
       'browser/services/gcm/instance_id/instance_id_profile_service_factory.h',
     ],
     'chrome_browser_session_sources': [
-      'browser/sessions/base_session_service_delegate_impl.cc',
-      'browser/sessions/base_session_service_delegate_impl.h',
       'browser/sessions/chrome_tab_restore_service_client.cc',
       'browser/sessions/chrome_tab_restore_service_client.h',
+      'browser/sessions/session_common_utils.cc',
+      'browser/sessions/session_common_utils.h',
       'browser/sessions/session_data_deleter.cc',
       'browser/sessions/session_data_deleter.h',
       'browser/sessions/session_restore_android.cc',
@@ -2902,10 +2902,10 @@
       'browser/sync/glue/synced_tab_delegate.cc',
       'browser/sync/glue/synced_tab_delegate_android.cc',
       'browser/sync/glue/synced_tab_delegate_android.h',
-      'browser/sync/glue/synced_window_delegates_getter_android.cc',
-      'browser/sync/glue/synced_window_delegates_getter_android.h',
       'browser/sync/glue/synced_window_delegate_android.cc',
       'browser/sync/glue/synced_window_delegate_android.h',
+      'browser/sync/glue/synced_window_delegates_getter_android.cc',
+      'browser/sync/glue/synced_window_delegates_getter_android.h',
       'browser/sync/glue/typed_url_change_processor.cc',
       'browser/sync/glue/typed_url_change_processor.h',
       'browser/sync/glue/typed_url_data_type_controller.cc',