Revert of ServiceWorker: Support includeUncontrolled option in clients.matchAll() (1/2, chromium)

content/browser/service_worker/service_worker_context_core.h

Index: content/browser/service_worker/service_worker_context_core.h
diff --git a/content/browser/service_worker/service_worker_context_core.h b/content/browser/service_worker/service_worker_context_core.h
index c2457a80f4e39d936fcc2096ea406d2f1da4349d..a38e8141abda3fb8a7482662aafffdcbc7b67e29 100644
--- a/content/browser/service_worker/service_worker_context_core.h
+++ b/content/browser/service_worker/service_worker_context_core.h
@@ -75,7 +75,7 @@
   static const base::FilePath::CharType kServiceWorkerDirectory[];
 
   // Iterates over ServiceWorkerProviderHost objects in a ProcessToProviderMap.
-  class CONTENT_EXPORT ProviderHostIterator {
+  class ProviderHostIterator {
    public:
     ~ProviderHostIterator();
     ServiceWorkerProviderHost* GetProviderHost();
@@ -84,15 +84,10 @@
 
    private:
     friend class ServiceWorkerContextCore;
-    using ProviderHostPredicate =
-        base::Callback<bool(ServiceWorkerProviderHost*)>;
-    ProviderHostIterator(ProcessToProviderMap* map,
-                         const ProviderHostPredicate& predicate);
+    explicit ProviderHostIterator(ProcessToProviderMap* map);
     void Initialize();
-    bool ForwardUntilMatchingProviderHost();
 
     ProcessToProviderMap* map_;
-    ProviderHostPredicate predicate_;
     scoped_ptr<ProcessToProviderMap::iterator> process_iterator_;
     scoped_ptr<ProviderMap::iterator> provider_host_iterator_;
 
@@ -154,21 +149,14 @@
   void RemoveAllProviderHostsForProcess(int process_id);
   scoped_ptr<ProviderHostIterator> GetProviderHostIterator();
 
-  // Returns a ProviderHost iterator for all ServiceWorker clients for
-  // the |origin|.  This only returns ProviderHosts that are of CONTROLLEE
-  // and belong to the |origin|.
-  scoped_ptr<ProviderHostIterator> GetClientProviderHostIterator(
-      const GURL& origin);
-
   // Maintains a map from Client UUID to ProviderHost.
   // (Note: instead of maintaining 2 maps we might be able to uniformly use
   // UUID instead of process_id+provider_id elsewhere. For now I'm leaving
   // these as provider_id is deeply wired everywhere)
-  void RegisterProviderHostByClientID(const std::string& client_uuid,
-                                      ServiceWorkerProviderHost* provider_host);
-  void UnregisterProviderHostByClientID(const std::string& client_uuid);
-  ServiceWorkerProviderHost* GetProviderHostByClientID(
-      const std::string& client_uuid);
+  void RegisterClientIDForProviderHost(
+      const std::string& client_uuid,
+      ServiceWorkerProviderHost* provider_host);
+  void UnregisterClientIDForProviderHost(const std::string& client_uuid);
 
   // A child process of |source_process_id| may be used to run the created
   // worker for initial installation.