Change event routers from singletons to being owned by the ExtensionService.

chrome/browser/extensions/extension_event_router.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/extensions/extension_event_router.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_devtools_manager.h"
 #include "chrome/browser/extensions/extension_processes_api.h"
 #include "chrome/browser/extensions/extension_processes_api_constants.h"
@@ skipping 88 matching lines @@
   EventListener listener(process, extension_id);
   DCHECK_EQ(listeners_[event_name].count(listener), 0u) << event_name;
   listeners_[event_name].insert(listener);
 
   if (extension_devtools_manager_.get())
     extension_devtools_manager_->AddEventListener(event_name, process->id());
 
   // We lazily tell the TaskManager to start updating when listeners to the
   // processes.onUpdated event arrive.
   if (event_name.compare(extension_processes_api_constants::kOnUpdated) == 0)
-    ExtensionProcessesEventRouter::GetInstance()->ListenerAdded();
+    profile_->GetExtensionService()->processes_event_router()->ListenerAdded();
 }
 
 void ExtensionEventRouter::RemoveEventListener(
     const std::string& event_name,
     RenderProcessHost* process,
     const std::string& extension_id) {
   EventListener listener(process, extension_id);
   DCHECK_EQ(listeners_[event_name].count(listener), 1u) <<
       " PID=" << process->id() << " extension=" << extension_id <<
       " event=" << event_name;
   listeners_[event_name].erase(listener);
   // Note: extension_id may point to data in the now-deleted listeners_ object.
   // Do not use.
 
   if (extension_devtools_manager_.get())
     extension_devtools_manager_->RemoveEventListener(event_name, process->id());
 
   // If a processes.onUpdated event listener is removed (or a process with one
   // exits), then we let the TaskManager know that it has one fewer listener.
   if (event_name.compare(extension_processes_api_constants::kOnUpdated) == 0)
-    ExtensionProcessesEventRouter::GetInstance()->ListenerRemoved();
+    profile_->GetExtensionService()->processes_event_router()->
+        ListenerRemoved();
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(
           &NotifyEventListenerRemovedOnIOThread,
           profile_->GetRuntimeId(), listener.extension_id, event_name));
 }
 
 bool ExtensionEventRouter::HasEventListener(const std::string& event_name) {
   return (listeners_.find(event_name) != listeners_.end() &&
@@ skipping 94 matching lines @@
           }
         }
       }
       break;
     }
     default:
       NOTREACHED();
       return;
   }
 }