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

chrome/browser/extensions/extension_webnavigation_api.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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/extension_webnavigation_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
@@ skipping 229 matching lines @@
   for (FrameIdIterator frame_id = frame_ids.first; frame_id != frame_ids.second;
        ++frame_id) {
     frame_state_map_.erase(frame_id->second);
   }
   tab_contents_map_.erase(tab_contents);
 }
 
 
 // ExtensionWebNavigtionEventRouter -------------------------------------------
 
-ExtensionWebNavigationEventRouter::ExtensionWebNavigationEventRouter() {}
-
-ExtensionWebNavigationEventRouter::~ExtensionWebNavigationEventRouter() {}
-
-// static
-ExtensionWebNavigationEventRouter*
-ExtensionWebNavigationEventRouter::GetInstance() {
-  return Singleton<ExtensionWebNavigationEventRouter>::get();
-}
-
 void ExtensionWebNavigationEventRouter::Init() {
   if (registrar_.IsEmpty()) {
     registrar_.Add(this,
                    NotificationType::CREATING_NEW_WINDOW,
                    NotificationService::AllSources());
   }
 }
 
 void ExtensionWebNavigationEventRouter::Observe(
     NotificationType type,
@@ skipping 175 matching lines @@
                       transition_type);
   DispatchOnDOMContentLoaded(tab_contents(),
                              url,
                              is_main_frame,
                              frame_id);
   DispatchOnCompleted(tab_contents(),
                       url,
                       is_main_frame,
                       frame_id);
 }