Change ownership of BackgroundSyncServiceImpl to BackgroundSyncContextImpl

content/browser/background_sync/background_sync_context_impl.h

Index: content/browser/background_sync/background_sync_context_impl.h
diff --git a/content/browser/background_sync/background_sync_context_impl.h b/content/browser/background_sync/background_sync_context_impl.h
index 861b6d2a3fdff982d94bb572d404cd6794eabfcc..c491f3ce4ff77924aeff62dc201397c033b8d61e 100644
--- a/content/browser/background_sync/background_sync_context_impl.h
+++ b/content/browser/background_sync/background_sync_context_impl.h
@@ -5,14 +5,18 @@
 #ifndef CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_CONTEXT_IMPL_H_
 
+#include <set>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/common/background_sync_service.mojom.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/background_sync_context.h"
 
 namespace content {
 
 class BackgroundSyncManager;
+class BackgroundSyncServiceImpl;
 class ServiceWorkerContextWrapper;
 
 // Implements the BackgroundSyncContext. One instance of this exists per
@@ -31,6 +35,17 @@ class CONTENT_EXPORT BackgroundSyncContextImpl : public BackgroundSyncContext {
   // Only callable on the IO thread.
   BackgroundSyncManager* background_sync_manager() const override;
 
+  // Create a BackgroundSyncServiceImpl that is owned by this.
+  static void CreateService(
+      const scoped_refptr<BackgroundSyncContextImpl>& context,
+      mojo::InterfaceRequest<BackgroundSyncService> request);
+  void CreateServiceOnIOThread(
+      mojo::InterfaceRequest<BackgroundSyncService> request);
+
+  // Called by BackgroundSyncServciceImpl objects so that they can
+  // be deleted.
+  void ServiceHadConnectionError(BackgroundSyncServiceImpl* service);
+
  protected:
   ~BackgroundSyncContextImpl() override;
 
@@ -43,6 +58,11 @@ class CONTENT_EXPORT BackgroundSyncContextImpl : public BackgroundSyncContext {
   // Only accessed on the IO thread.
   scoped_ptr<BackgroundSyncManager> background_sync_manager_;
 
+  // The services are owned by this. They're either deleted
+  // during ShutdownOnIO or when the channel is closed via
+  // ServiceHadConnectionError.
+  std::set<BackgroundSyncServiceImpl*> services_;
+
   DISALLOW_COPY_AND_ASSIGN(BackgroundSyncContextImpl);
 };