Changed ChromeURLDataManager to a ProfileKeyedService and made a Factory for it.

chrome/browser/ui/webui/downloads_dom_handler.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/ui/webui/downloads_dom_handler.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/string_piece.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/download/download_history.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
+#include "chrome/browser/ui/webui/chrome_url_data_manager_factory.h"
 #include "chrome/browser/ui/webui/fileicon_source.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/gfx/image/image.h"
 
 #if !defined(OS_MACOSX)
@@ skipping 46 matching lines @@
 }
 
 }  // namespace
 
 DownloadsDOMHandler::DownloadsDOMHandler(content::DownloadManager* dlm)
     : search_text_(),
       download_manager_(dlm),
       original_profile_download_manager_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   // Create our fileicon data source.
-  Profile::FromBrowserContext(dlm->GetBrowserContext())->
-      GetChromeURLDataManager()->AddDataSource(new FileIconSource());
+  Profile* profile = Profile::FromBrowserContext(dlm->GetBrowserContext());
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(new FileIconSource());
 
   // Figure out our parent DownloadManager, if any.
-  Profile* profile =
-      Profile::FromBrowserContext(download_manager_->GetBrowserContext());
   Profile* original_profile = profile->GetOriginalProfile();
   if (original_profile != profile) {
     original_profile_download_manager_ = DownloadServiceFactory::GetForProfile(
         original_profile)->GetDownloadManager();
   }
 }
 
 DownloadsDOMHandler::~DownloadsDOMHandler() {
   ClearDownloadItems();
   download_manager_->RemoveObserver(this);
@@ skipping 291 matching lines @@
 }
 
 content::DownloadItem* DownloadsDOMHandler::GetDownloadByValue(
     const ListValue* args) {
   int id;
   if (ExtractIntegerValue(args, &id)) {
     return GetDownloadById(id);
   }
   return NULL;
 }