Change many extension event routers to not be singletons and to be more profile-aware.

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(
+    Profile* profile) : profile_(profile) {}
 
 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,
     const NotificationSource& source,
     const NotificationDetails& details) {
   switch (type.value) {
     case NotificationType::CREATING_NEW_WINDOW:
       CreatingNewWindow(
           Source<TabContents>(source).ptr(),
           Details<const ViewHostMsg_CreateWindow_Params>(details).ptr());
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 void ExtensionWebNavigationEventRouter::CreatingNewWindow(
     TabContents* tab_contents,
     const ViewHostMsg_CreateWindow_Params* details) {
-  DispatchOnBeforeRetarget(tab_contents,
-                           tab_contents->profile(),
-                           details->opener_url,
-                           details->target_url);
+  if (profile_->IsSameProfile(tab_contents->profile())) {
+    DispatchOnBeforeRetarget(tab_contents,
+                             tab_contents->profile(),
+                             details->opener_url,
+                             details->target_url);
+  }
 }
 
 
 // ExtensionWebNavigationTabObserver ------------------------------------------
 
 ExtensionWebNavigationTabObserver::ExtensionWebNavigationTabObserver(
     TabContents* tab_contents)
     : TabContentsObserver(tab_contents) {}
 
 ExtensionWebNavigationTabObserver::~ExtensionWebNavigationTabObserver() {}
@@ skipping 144 matching lines @@
                       transition_type);
   DispatchOnDOMContentLoaded(tab_contents(),
                              url,
                              is_main_frame,
                              frame_id);
   DispatchOnCompleted(tab_contents(),
                       url,
                       is_main_frame,
                       frame_id);
 }