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

chrome/browser/ui/webui/feedback_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/ui/webui/feedback_ui.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/feedback/feedback_data.h"
 #include "chrome/browser/feedback/feedback_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.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_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/screenshot_source.h"
 #include "chrome/browser/ui/window_snapshot/window_snapshot.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
@@ skipping 261 matching lines @@
   }
   // Make sure we don't leave any screenshot data around.
   FeedbackUtil::ClearScreenshotPng();
 }
 
 void FeedbackHandler::ClobberScreenshotsSource() {
   // Re-create our screenshots data source (this clobbers the last source)
   // setting the screenshot to NULL, effectively disabling the source
   // TODO(rkc): Once there is a method to 'remove' a source, change this code
   Profile* profile = Profile::FromBrowserContext(tab_->GetBrowserContext());
-  profile->GetChromeURLDataManager()->AddDataSource(new ScreenshotSource(NULL));
+  ChromeURLDataManager::AddDataSource(profile, new ScreenshotSource(NULL));
 
   FeedbackUtil::ClearScreenshotPng();
 }
 
 void FeedbackHandler::SetupScreenshotsSource() {
   // If we don't already have a screenshot source object created, create one.
   if (!screenshot_source_) {
     screenshot_source_ =
         new ScreenshotSource(FeedbackUtil::GetScreenshotPng());
   }
   // Add the source to the data manager.
   Profile* profile = Profile::FromBrowserContext(tab_->GetBrowserContext());
-  profile->GetChromeURLDataManager()->AddDataSource(screenshot_source_);
+  ChromeURLDataManager::AddDataSource(profile, screenshot_source_);
 }
 
 bool FeedbackHandler::Init() {
   std::string page_url;
   if (tab_->GetController().GetActiveEntry()) {
      page_url = tab_->GetController().GetActiveEntry()->GetURL().spec();
   }
 
   url_parse::Parsed parts;
   ParseStandardURL(page_url.c_str(), page_url.length(), &parts);
@@ skipping 248 matching lines @@
 FeedbackUI::FeedbackUI(content::WebUI* web_ui) : HtmlDialogUI(web_ui) {
   FeedbackHandler* handler = new FeedbackHandler(web_ui->GetWebContents());
   web_ui->AddMessageHandler(handler);
 
   // The handler's init will determine whether we show the error html page.
   ChromeWebUIDataSource* html_source =
       CreateFeedbackUIHTMLSource(handler->Init());
 
   // Set up the chrome://feedback/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
-  profile->GetChromeURLDataManager()->AddDataSource(html_source);
+  ChromeURLDataManager::AddDataSource(profile, html_source);
 }
 
 #if defined(OS_CHROMEOS)
 // static
 void FeedbackUI::GetMostRecentScreenshots(
     const FilePath& filepath,
     std::vector<std::string>* saved_screenshots,
     size_t max_saved) {
   file_util::FileEnumerator screenshots(filepath, false,
                                         file_util::FileEnumerator::FILES,
                                         std::string(kScreenshotPattern));
   FilePath screenshot = screenshots.Next();
 
   std::vector<std::string> screenshot_filepaths;
   while (!screenshot.empty()) {
     screenshot_filepaths.push_back(screenshot.BaseName().value());
     screenshot = screenshots.Next();
   }
 
   size_t sort_size = std::min(max_saved, screenshot_filepaths.size());
   std::partial_sort(screenshot_filepaths.begin(),
                     screenshot_filepaths.begin() + sort_size,
                     screenshot_filepaths.end(),
                     ScreenshotTimestampComp);
   for (size_t i = 0; i < sort_size; ++i)
     saved_screenshots->push_back(std::string(kSavedScreenshotsUrl) +
                                    screenshot_filepaths[i]);
 }
 #endif