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

chrome/browser/ui/webui/chrome_url_data_manager.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_helpers.h"
 #include "base/synchronization/lock.h"
+#include "chrome/browser/profiles/profile_keyed_service.h"
 
 class ChromeURLDataManagerBackend;
 class MessageLoop;
+class Profile;
 class RefCountedMemory;
 
 namespace base {
 class DictionaryValue;
 }
 
 // To serve dynamic data off of chrome: URLs, implement the
 // ChromeURLDataManager::DataSource interface and register your handler
 // with AddDataSource. DataSources must be added on the UI thread (they are also
 // deleted on the UI thread). Internally the DataSources are maintained by
 // ChromeURLDataManagerBackend, see it for details.
-class ChromeURLDataManager {
+class ChromeURLDataManager : public ProfileKeyedService {
  public:
   class DataSource;
 
   // Trait used to handle deleting a DataSource. Deletion happens on the UI
   // thread.
   //
   // Implementation note: the normal shutdown sequence is for the UI loop to
   // stop pumping events then the IO loop and thread are stopped. When the
   // DataSources are no longer referenced (which happens when IO thread stops)
   // they get added to the UI message loop for deletion. But because the UI loop
@@ skipping 112 matching lines @@
   // |DeleteOnUIThread| trait to insure that the destructor is called on the UI
   // thread. This is necessary as some |DataSource|s notably |FileIconSource|
   // and |FaviconSource|, have members that will DCHECK if they are not
   // destructed in the same thread as they are constructed (the UI thread).
   void AddDataSource(DataSource* source);
 
   // Deletes any data sources no longer referenced. This is normally invoked
   // for you, but can be invoked to force deletion (such as during shutdown).
   static void DeleteDataSources();
 
+  // Convenience wrapper function to add |source| to |profile|'s
+  // |ChromeURLDataManager|.
+  static void AddDataSource(Profile *profile, DataSource* source);

[Evan Stade, 2012/04/24 21:22:14]

star on the left

[Kyle Horimoto, 2012/04/24 22:17:49]

Done.

+
  private:
   typedef std::vector<const ChromeURLDataManager::DataSource*> DataSources;
 
   // If invoked on the UI thread the DataSource is deleted immediatlye,
   // otherwise it is added to |data_sources_| and a task is scheduled to handle
   // deletion on the UI thread. See note abouve DeleteDataSource for more info.
   static void DeleteDataSource(const DataSource* data_source);
 
   // Returns true if |data_source| is scheduled for deletion (|DeleteDataSource|
   // was invoked).
   static bool IsScheduledForDeletion(const DataSource* data_source);
 
   // A callback that returns the ChromeURLDataManagerBackend. Only accessible on
   // the IO thread. This is necessary because ChromeURLDataManager is created on
   // the UI thread, but ChromeURLDataManagerBackend lives on the IO thread.
   const base::Callback<ChromeURLDataManagerBackend*(void)> backend_;
 
   // |data_sources_| that are no longer referenced and scheduled for deletion.
   // Protected by g_delete_lock in the .cc file.
   static DataSources* data_sources_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLDataManager);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_