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..52dfdc9691c6ac92be1d9b2c6c90e482a6449719 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
@@ -26,9 +30,19 @@ class CONTENT_EXPORT BackgroundSyncContextImpl : public BackgroundSyncContext {
   // Init and Shutdown are for use on the UI thread when the
   // StoragePartition is being setup and torn down.
   void Init(const scoped_refptr<ServiceWorkerContextWrapper>& context);
+
+  // Shutdown must be called before deleting this. Call on the UI thread.
   void Shutdown();
 
-  // Only callable on the IO thread.
+  // Create a BackgroundSyncServiceImpl that is owned by this. Call on the UI
+  // thread.
+  void CreateService(mojo::InterfaceRequest<BackgroundSyncService> request);
+
+  // Called by BackgroundSyncServciceImpl objects so that they can

[davidben, 2015/08/13 15:49:18]

BackgroundSyncServiceImpl

[jkarlin, 2015/08/13 15:51:20]

Done.

+  // be deleted. Call on the IO thread.
+  void ServiceHadConnectionError(BackgroundSyncServiceImpl* service);
+
+  // Call on the IO thread.
   BackgroundSyncManager* background_sync_manager() const override;
 
  protected:
@@ -38,11 +52,19 @@ class CONTENT_EXPORT BackgroundSyncContextImpl : public BackgroundSyncContext {
   void CreateBackgroundSyncManager(
       const scoped_refptr<ServiceWorkerContextWrapper>& context);
 
+  void CreateServiceOnIOThread(
+      mojo::InterfaceRequest<BackgroundSyncService> request);
+
   void ShutdownOnIO();
 
   // 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. Only accessed on the IO thread.
+  std::set<BackgroundSyncServiceImpl*> services_;
+
   DISALLOW_COPY_AND_ASSIGN(BackgroundSyncContextImpl);
 };