Don't derive from ChromeURLDataManager::DataSource, and instead have these classes implement a dele…

chrome/browser/extensions/extension_service.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_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 
@@ skipping 1069 matching lines @@
   // Same for chrome://theme/ resources.
   if (extension->HasHostPermission(GURL(chrome::kChromeUIThemeURL))) {
     ThemeSource* theme_source = new ThemeSource(profile_);
     ChromeURLDataManager::AddDataSource(profile_, theme_source);
   }
 #endif
 
   // Same for chrome://thumb/ resources.
   if (extension->HasHostPermission(GURL(chrome::kChromeUIThumbnailURL))) {
     ThumbnailSource* thumbnail_source = new ThumbnailSource(profile_);
-    ChromeURLDataManagerFactory::GetForProfile(profile_)->
-        AddDataSource(thumbnail_source);
+    ChromeURLDataManager::AddDataSource(profile_, thumbnail_source);
   }
 
 #if defined(ENABLE_PLUGINS)
   // TODO(mpcomplete): This ends up affecting all profiles. See crbug.com/80757.
   bool plugins_changed = false;
   for (size_t i = 0; i < extension->plugins().size(); ++i) {
     const Extension::PluginInfo& plugin = extension->plugins()[i];
     PluginService::GetInstance()->RefreshPlugins();
     PluginService::GetInstance()->AddExtraPluginPath(plugin.path);
     plugins_changed = true;
@@ skipping 2021 matching lines @@
     scoped_refptr<const Extension> extension = GetInstalledExtension(*it);
     DCHECK(extension);
     if (!extension)
       continue;
     blacklisted_extensions_.Insert(extension);
     UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
   }
 
   IdentifyAlertableExtensions();
 }