Moved some functions off ExtensionService into a new file extension_util.

chrome/browser/extensions/extension_web_ui.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/extension_web_ui.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/image_loader.h"
 #include "chrome/browser/favicon/favicon_util.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/incognito_handler.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
@@ skipping 194 matching lines @@
       // were deleted directly from the filesystem, etc.
       LOG(WARNING) << "chrome URL override present for non-existant extension";
       UnregisterChromeURLOverride(page, profile, val);
       continue;
     }
 
     // We can't handle chrome-extension URLs in incognito mode unless the
     // extension uses split mode.
     bool incognito_override_allowed =
         extensions::IncognitoInfo::IsSplitMode(extension) &&
-        service->IsIncognitoEnabled(extension->id());
+        extension_util::IsIncognitoEnabled(extension->id(), service);
     if (profile->IsOffTheRecord() && !incognito_override_allowed) {
       ++i;
       continue;
     }
 
     *url = extension_url;
     return true;
   }
   return false;
 }
@@ skipping 175 matching lines @@
             extensions::ImageLoader::ImageRepresentation::ALWAYS_RESIZE,
             gfx::Size(pixel_size, pixel_size),
             scale_factors[i]));
   }
 
   // LoadImagesAsync actually can run callback synchronously. We want to force
   // async.
   extensions::ImageLoader::Get(profile)->LoadImagesAsync(
       extension, info_list, base::Bind(&RunFaviconCallbackAsync, callback));
 }