Convert EmbeddedWorker to InterfaceRegistry/Provider.

content/browser/service_worker/embedded_worker_instance.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_
 #define CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 20 matching lines @@
 #ifdef SendMessage
 #undef SendMessage
 #endif
 
 struct EmbeddedWorkerMsg_StartWorker_Params;
 
 namespace IPC {
 class Message;
 }
 
+namespace shell {
+class InterfaceProvider;
+class InterfaceRegistry;
+}
+
 namespace content {
 
 class EmbeddedWorkerRegistry;
 class MessagePortMessageFilter;
-class ServiceRegistry;
-class ServiceRegistryImpl;
 class ServiceWorkerContextCore;
 
 // This gives an interface to control one EmbeddedWorker instance, which
 // may be 'in-waiting' or running in one of the child processes added by
 // AddProcessReference().
 class CONTENT_EXPORT EmbeddedWorkerInstance {
  public:
   typedef base::Callback<void(ServiceWorkerStatusCode)> StatusCallback;
 
   // This enum is used in UMA histograms. Append-only.
@@ skipping 66 matching lines @@
   void StopIfIdle();
 
   // Sends |message| to the embedded worker running in the child process.
   // It is invalid to call this while the worker is not in STARTING or RUNNING
   // status.
   ServiceWorkerStatusCode SendMessage(const IPC::Message& message);
 
   // Resumes the worker if it paused after download.
   void ResumeAfterDownload();
 
-  // Returns the ServiceRegistry for this worker. It is invalid to call this
-  // when the worker is not in STARTING or RUNNING status.
-  ServiceRegistry* GetServiceRegistry();
+  // Returns the shell::InterfaceRegistry and shell::InterfaceProvider for this
+  // worker. It is invalid to call this when the worker is not in STARTING or
+  // RUNNING status.
+  shell::InterfaceRegistry* GetInterfaceRegistry();
+  shell::InterfaceProvider* GetRemoteInterfaces();
 
   int embedded_worker_id() const { return embedded_worker_id_; }
   EmbeddedWorkerStatus status() const { return status_; }
   StartingPhase starting_phase() const {
     DCHECK_EQ(EmbeddedWorkerStatus::STARTING, status());
     return starting_phase_;
   }
   int process_id() const;
   int thread_id() const { return thread_id_; }
   // This should be called only when the worker instance has a valid process,
@@ skipping 144 matching lines @@
 
   base::WeakPtr<ServiceWorkerContextCore> context_;
   scoped_refptr<EmbeddedWorkerRegistry> registry_;
   const int embedded_worker_id_;
   EmbeddedWorkerStatus status_;
   StartingPhase starting_phase_;
 
   // Current running information.
   std::unique_ptr<EmbeddedWorkerInstance::WorkerProcessHandle> process_handle_;
   int thread_id_;
-  std::unique_ptr<ServiceRegistryImpl> service_registry_;
+  std::unique_ptr<shell::InterfaceRegistry> interface_registry_;
+  std::unique_ptr<shell::InterfaceProvider> remote_interfaces_;
 
   // Whether devtools is attached or not.
   bool devtools_attached_;
 
   // True if the script load request accessed the network. If the script was
   // served from HTTPCache or ServiceWorkerDatabase this value is false.
   bool network_accessed_for_script_;
 
   ListenerList listener_list_;
   std::unique_ptr<DevToolsProxy> devtools_proxy_;
 
   std::unique_ptr<StartTask> inflight_start_task_;
 
   // This is valid only after a process is allocated for the worker.
   ServiceWorkerMetrics::StartSituation start_situation_ =
       ServiceWorkerMetrics::StartSituation::UNKNOWN;
 
   // Used for UMA. The start time of the current start sequence step.
   base::TimeTicks step_time_;
 
   base::WeakPtrFactory<EmbeddedWorkerInstance> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerInstance);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_SERVICE_WORKER_EMBEDDED_WORKER_INSTANCE_H_