Moved some functions off ExtensionService into a new file extension_util.

chrome/browser/extensions/api/tabs/windows_event_router.cc

 // 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.
 
 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
 
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/windows.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_service.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/base/x/active_window_watcher_x.h"
 #endif
@@ skipping 86 matching lines @@
 static void WillDispatchWindowFocusedEvent(Profile* new_active_profile,
                                            int window_id,
                                            Profile* profile,
                                            const Extension* extension,
                                            base::ListValue* event_args) {
   // When switching between windows in the default and incognito profiles,
   // dispatch WINDOW_ID_NONE to extensions whose profile lost focus that
   // can't see the new focused window across the incognito boundary.
   // See crbug.com/46610.
   if (new_active_profile && new_active_profile != profile &&
-      !extensions::ExtensionSystem::Get(profile)->extension_service()->
-          CanCrossIncognito(extension)) {
+      !extension_util::CanCrossIncognito(
+          extension,
+          extensions::ExtensionSystem::Get(profile)->extension_service())) {
     event_args->Clear();
     event_args->Append(new base::FundamentalValue(
         extension_misc::kUnknownWindowId));
   } else {
     event_args->Clear();
     event_args->Append(new base::FundamentalValue(window_id));
   }
 }
 
 void WindowsEventRouter::OnActiveWindowChanged(
@@ skipping 23 matching lines @@
 
 void WindowsEventRouter::DispatchEvent(const std::string& event_name,
                                       Profile* profile,
                                       scoped_ptr<base::ListValue> args) {
   scoped_ptr<Event> event(new Event(event_name, args.Pass()));
   event->restrict_to_profile = profile;
   ExtensionSystem::Get(profile)->event_router()->BroadcastEvent(event.Pass());
 }
 
 }  // namespace extensions