| Index: content/browser/devtools/protocol/service_worker_handler.h
 | 
| diff --git a/content/browser/devtools/protocol/service_worker_handler.h b/content/browser/devtools/protocol/service_worker_handler.h
 | 
| index 892a8c7ec031fbfbfea541a0956698e833390dcc..359a08e05e947dc85fdbf0903d34ee17ea86d7f4 100644
 | 
| --- a/content/browser/devtools/protocol/service_worker_handler.h
 | 
| +++ b/content/browser/devtools/protocol/service_worker_handler.h
 | 
| @@ -11,18 +11,11 @@
 | 
|  
 | 
|  #include "base/macros.h"
 | 
|  #include "base/memory/weak_ptr.h"
 | 
| -#include "content/browser/devtools/protocol/devtools_protocol_dispatcher.h"
 | 
| +#include "content/browser/devtools/protocol/service_worker.h"
 | 
|  #include "content/browser/devtools/service_worker_devtools_agent_host.h"
 | 
|  #include "content/browser/devtools/service_worker_devtools_manager.h"
 | 
|  #include "content/browser/service_worker/service_worker_context_observer.h"
 | 
|  #include "content/browser/service_worker/service_worker_info.h"
 | 
| -#include "content/public/browser/devtools_agent_host.h"
 | 
| -#include "content/public/browser/devtools_agent_host_client.h"
 | 
| -
 | 
| -// Windows headers will redefine SendMessage.
 | 
| -#ifdef SendMessage
 | 
| -#undef SendMessage
 | 
| -#endif
 | 
|  
 | 
|  namespace content {
 | 
|  
 | 
| @@ -30,37 +23,32 @@ class RenderFrameHostImpl;
 | 
|  class ServiceWorkerContextWatcher;
 | 
|  class ServiceWorkerContextWrapper;
 | 
|  
 | 
| -namespace devtools {
 | 
| -namespace service_worker {
 | 
| +namespace protocol {
 | 
|  
 | 
| -class ServiceWorkerHandler {
 | 
| +class ServiceWorkerHandler : public ServiceWorker::Backend {
 | 
|   public:
 | 
| -  typedef DevToolsProtocolClient::Response Response;
 | 
| -
 | 
|    ServiceWorkerHandler();
 | 
| -  ~ServiceWorkerHandler();
 | 
| +  ~ServiceWorkerHandler() override;
 | 
|  
 | 
| +  void Wire(UberDispatcher*);
 | 
|    void SetRenderFrameHost(RenderFrameHostImpl* render_frame_host);
 | 
| -  void SetClient(std::unique_ptr<Client> client);
 | 
| -  void Detached();
 | 
| -
 | 
| -  // Protocol 'service worker' domain implementation.
 | 
| -  Response Enable();
 | 
| -  Response Disable();
 | 
| -  Response Unregister(const std::string& scope_url);
 | 
| -  Response StartWorker(const std::string& scope_url);
 | 
| -  Response SkipWaiting(const std::string& scope_url);
 | 
| -  Response StopWorker(const std::string& version_id);
 | 
| -  Response UpdateRegistration(const std::string& scope_url);
 | 
| -  Response InspectWorker(const std::string& version_id);
 | 
| -  Response SetForceUpdateOnPageLoad(bool force_update_on_page_load);
 | 
| +
 | 
| +  Response Enable() override;
 | 
| +  Response Disable() override;
 | 
| +  Response Unregister(const std::string& scope_url) override;
 | 
| +  Response StartWorker(const std::string& scope_url) override;
 | 
| +  Response SkipWaiting(const std::string& scope_url) override;
 | 
| +  Response StopWorker(const std::string& version_id) override;
 | 
| +  Response UpdateRegistration(const std::string& scope_url) override;
 | 
| +  Response InspectWorker(const std::string& version_id) override;
 | 
| +  Response SetForceUpdateOnPageLoad(bool force_update_on_page_load) override;
 | 
|    Response DeliverPushMessage(const std::string& origin,
 | 
|                                const std::string& registration_id,
 | 
| -                              const std::string& data);
 | 
| +                              const std::string& data) override;
 | 
|    Response DispatchSyncEvent(const std::string& origin,
 | 
|                               const std::string& registration_id,
 | 
|                               const std::string& tag,
 | 
| -                             bool last_chance);
 | 
| +                             bool last_chance) override;
 | 
|  
 | 
|   private:
 | 
|    void OnWorkerRegistrationUpdated(
 | 
| @@ -75,7 +63,7 @@ class ServiceWorkerHandler {
 | 
|    void ClearForceUpdate();
 | 
|  
 | 
|    scoped_refptr<ServiceWorkerContextWrapper> context_;
 | 
| -  std::unique_ptr<Client> client_;
 | 
| +  std::unique_ptr<ServiceWorker::Frontend> frontend_;
 | 
|    bool enabled_;
 | 
|    scoped_refptr<ServiceWorkerContextWatcher> context_watcher_;
 | 
|    RenderFrameHostImpl* render_frame_host_;
 | 
| @@ -85,8 +73,7 @@ class ServiceWorkerHandler {
 | 
|    DISALLOW_COPY_AND_ASSIGN(ServiceWorkerHandler);
 | 
|  };
 | 
|  
 | 
| -}  // namespace service_worker
 | 
| -}  // namespace devtools
 | 
| +}  // namespace protocol
 | 
|  }  // namespace content
 | 
|  
 | 
|  #endif  // CONTENT_BROWSER_DEVTOOLS_PROTOCOL_SERVICE_WORKER_HANDLER_H_
 | 
| 
 |