Revert 200932 "Lower the priority of shared workers that aren't ..."

trunk/src/content/browser/worker_host/worker_service_impl.h

 // Copyright (c) 2012 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_WORKER_HOST_WORKER_SERVICE_H_
 #define CONTENT_BROWSER_WORKER_HOST_WORKER_SERVICE_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/browser/worker_host/worker_process_host.h"
-#include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/worker_service.h"
 
 class GURL;
 struct ViewHostMsg_CreateWorker_Params;
 
 namespace content {
 class ResourceContext;
 class WorkerServiceObserver;
 class WorkerStoragePartition;
-class WorkerPrioritySetter;
 
 class CONTENT_EXPORT WorkerServiceImpl
     : public NON_EXPORTED_BASE(WorkerService) {
  public:
   // Returns the WorkerServiceImpl singleton.
   static WorkerServiceImpl* GetInstance();
 
   // WorkerService implementation:
   virtual bool TerminateWorker(int process_id, int route_id) OVERRIDE;
   virtual std::vector<WorkerInfo> GetWorkers() OVERRIDE;
@@ skipping 31 matching lines @@
   bool GetRendererForWorker(int worker_process_id,
                             int* render_process_id,
                             int* render_view_id) const;
   const WorkerProcessHost::WorkerInstance* FindWorkerInstance(
       int worker_process_id);
 
   void NotifyWorkerDestroyed(
       WorkerProcessHost* process,
       int worker_route_id);
 
-  void NotifyWorkerProcessCreated();
-
   // Used when we run each worker in a separate process.
   static const int kMaxWorkersWhenSeparate;
   static const int kMaxWorkersPerTabWhenSeparate;
 
  private:
   friend struct DefaultSingletonTraits<WorkerServiceImpl>;
 
   WorkerServiceImpl();
   virtual ~WorkerServiceImpl();
 
@@ skipping 30 matching lines @@
       const string16& name,
       const WorkerStoragePartition& worker_partition,
       ResourceContext* resource_context);
 
   WorkerProcessHost::WorkerInstance* FindSharedWorkerInstance(
       const GURL& url,
       const string16& name,
       const WorkerStoragePartition& worker_partition,
       ResourceContext* resource_context);
 
-  scoped_refptr<WorkerPrioritySetter> priority_setter_;
-
+  NotificationRegistrar registrar_;
   int next_worker_route_id_;
 
   WorkerProcessHost::Instances queued_workers_;
 
   // These are shared workers that have been looked up, but not created yet.
   // We need to keep a list of these to synchronously detect shared worker
   // URL mismatches when two pages launch shared workers simultaneously.
   WorkerProcessHost::Instances pending_shared_workers_;
 
   ObserverList<WorkerServiceObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WorkerServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WORKER_HOST_WORKER_SERVICE_H_