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

chrome/browser/ui/webui/uber/uber_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/uber/uber_ui.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.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/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 94 matching lines @@
   source->AddString("overridesHistory",
                     ASCIIToUTF16(overridesHistory ? "yes" : "no"));
 
   return source;
 }
 
 }  // namespace
 
 UberUI::UberUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
-  profile->GetChromeURLDataManager()->AddDataSource(CreateUberHTMLSource());
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(CreateUberHTMLSource());
 
   // The user may use a virtual (short) URL to get to the page. To avoid
   // duplicate uber tabs, clear the virtual URL so that the omnibox will show
   // the real URL. http://crbug.com/111878.
   NavigationController* controller = &web_ui->GetWebContents()->GetController();
   NavigationEntry* pending_entry = controller->GetPendingEntry();
   if (pending_entry && !pending_entry->IsViewSourceMode())
     pending_entry->SetVirtualURL(GURL());
 
   RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
@@ skipping 52 matching lines @@
   // return subpage->second->GetController()->OverrideHandleWebUIMessage(
   //     source_url, message, args);
   subpage->second->ProcessWebUIMessage(source_url, message, args);
   return true;
 }
 
 // UberFrameUI
 
 UberFrameUI::UberFrameUI(content::WebUI* web_ui) : WebUIController(web_ui) {
   Profile* profile = Profile::FromWebUI(web_ui);
-  profile->GetChromeURLDataManager()->AddDataSource(
-      CreateUberFrameHTMLSource(profile));
+  ChromeURLDataManagerFactory::GetForProfile(profile)->
+      AddDataSource(CreateUberFrameHTMLSource(profile));
 
   // Register as an observer for when extensions are loaded and unloaded.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(profile));
 }
 
 UberFrameUI::~UberFrameUI() {
 }
@@ skipping 17 matching lines @@
       scoped_ptr<Value> overrideValue(
           Value::CreateStringValue(overridesHistory ? "yes" : "no"));
       web_ui()->CallJavascriptFunction(
           "uber_frame.setNavigationOverride", *controlsValue, *overrideValue);
       break;
     }
     default:
       NOTREACHED();
   }
 }