Mostly manual refactoring of ServiceWorkerRequestHandler into a base class and two derived classes,…

content/content_browser.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../google_apis/google_apis.gyp:google_apis',
     '../net/net.gyp:net',
@@ skipping 1130 matching lines @@
     'browser/screen_orientation/screen_orientation_provider.h',
     'browser/screen_orientation/screen_orientation_provider_android.h',
     'browser/screen_orientation/screen_orientation_provider_android.cc',
     'browser/service_worker/embedded_worker_instance.cc',
     'browser/service_worker/embedded_worker_instance.h',
     'browser/service_worker/embedded_worker_registry.cc',
     'browser/service_worker/embedded_worker_registry.h',
     'browser/service_worker/service_worker_context_core.cc',
     'browser/service_worker/service_worker_context_core.h',
     'browser/service_worker/service_worker_context_observer.h',
+    'browser/service_worker/service_worker_context_request_handler.cc',
+    'browser/service_worker/service_worker_context_request_handler.h',
     'browser/service_worker/service_worker_context_wrapper.cc',
     'browser/service_worker/service_worker_context_wrapper.h',
+    'browser/service_worker/service_worker_controllee_request_handler.cc',
+    'browser/service_worker/service_worker_controllee_request_handler.h',
     'browser/service_worker/service_worker_database.cc',
     'browser/service_worker/service_worker_database.h',
     'browser/service_worker/service_worker_dispatcher_host.cc',
     'browser/service_worker/service_worker_dispatcher_host.h',
     'browser/service_worker/service_worker_fetch_dispatcher.cc',
     'browser/service_worker/service_worker_fetch_dispatcher.h',
     'browser/service_worker/service_worker_handle.cc',
     'browser/service_worker/service_worker_handle.h',
     'browser/service_worker/service_worker_info.cc',
     'browser/service_worker/service_worker_info.h',
@@ skipping 555 matching lines @@
         '../build/linux/system.gyp:dbus',
         '../dbus/dbus.gyp:dbus',
       ],
     }, {  # OS != "linux" or use_dbus==0
       'sources!': [
         'browser/geolocation/wifi_data_provider_linux.cc',
       ],
     }],
   ],
 }