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

chrome/browser/ui/webui/chromeos/proxy_settings_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/chromeos/proxy_settings_ui.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 69 matching lines @@
   core_handler_->set_handlers_host(this);
   core_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(core_handler_);
 
   proxy_handler_->GetLocalizedValues(localized_strings);
   web_ui->AddMessageHandler(proxy_handler_);
 
   ProxySettingsHTMLSource* source =
       new ProxySettingsHTMLSource(localized_strings);
   Profile* profile = Profile::FromWebUI(web_ui);
-  profile->GetChromeURLDataManager()->AddDataSource(source);
+  ChromeURLDataManager::AddDataSource(profile, source);
 }
 
 ProxySettingsUI::~ProxySettingsUI() {
   // Uninitialize all registered handlers. The base class owns them and it will
   // eventually delete them.
   core_handler_->Uninitialize();
   proxy_handler_->Uninitialize();
 }
 
 void ProxySettingsUI::InitializeHandlers() {
   core_handler_->InitializeHandler();
   proxy_handler_->InitializeHandler();
   core_handler_->InitializePage();
   proxy_handler_->InitializePage();
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();
   proxy_tracker->UIMakeActiveNetworkCurrent();
   std::string network_name;
   proxy_tracker->UIGetCurrentNetworkName(&network_name);
 }
 
 }  // namespace chromeos