Moved some functions off ExtensionService into a new file extension_util.

chrome/browser/extensions/api/preference/preference_helpers.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/preference/preference_helpers.h"
 
 #include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_prefs.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/profiles/profile.h"
 #include "chrome/common/extensions/incognito_handler.h"
 
 namespace extensions {
 namespace preference_helpers {
 
 namespace {
 
 const char kIncognitoPersistent[] = "incognito_persistent";
 const char kIncognitoSessionOnly[] = "incognito_session_only";
@@ skipping 70 matching lines @@
   ExtensionService* extension_service =
       ExtensionSystem::Get(profile)->extension_service();
   const ExtensionSet* extensions = extension_service->extensions();
   for (ExtensionSet::const_iterator it = extensions->begin();
        it != extensions->end(); ++it) {
     std::string extension_id = (*it)->id();
     // TODO(bauerb): Only iterate over registered event listeners.
     if (router->ExtensionHasEventListener(extension_id, event_name) &&
         (*it)->HasAPIPermission(permission) &&
         (!incognito || IncognitoInfo::IsSplitMode(it->get()) ||
-         extension_service->CanCrossIncognito(it->get()))) {
+         extension_util::CanCrossIncognito(it->get(), extension_service))) {
       // Inject level of control key-value.
       base::DictionaryValue* dict;
       bool rv = args->GetDictionary(0, &dict);
       DCHECK(rv);
       std::string level_of_control =
           GetLevelOfControl(profile, extension_id, browser_pref, incognito);
       dict->SetString(kLevelOfControlKey, level_of_control);
 
       // If the extension is in incognito split mode,
       // a) incognito pref changes are visible only to the incognito tabs
       // b) regular pref changes are visible only to the incognito tabs if the
       //    incognito pref has not alredy been set
       Profile* restrict_to_profile = NULL;
       bool from_incognito = false;
       if (IncognitoInfo::IsSplitMode(it->get())) {
-        if (incognito && extension_service->IsIncognitoEnabled(extension_id)) {
+        if (incognito &&
+            extension_util::IsIncognitoEnabled(extension_id,
+                                               extension_service)) {
           restrict_to_profile = profile->GetOffTheRecordProfile();
         } else if (!incognito &&
                    PreferenceAPI::Get(profile)->DoesExtensionControlPref(
                        extension_id,
                        browser_pref,
                        &from_incognito) &&
                    from_incognito) {
           restrict_to_profile = profile;
         }
       }
 
       scoped_ptr<base::ListValue> args_copy(args->DeepCopy());
       scoped_ptr<Event> event(new Event(event_name, args_copy.Pass()));
       event->restrict_to_profile = restrict_to_profile;
       router->DispatchEventToExtension(extension_id, event.Pass());
     }
   }
 }
 
 }  // namespace preference_helpers
 }  // namespace extensions