Move core url data manager classes to content.

content/browser/webui/url_data_manager.h

 // 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.
 
-#ifndef CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
-#define CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
+#ifndef CONTENT_BROWSER_WEBUI_URL_DATA_MANAGER_H_
+#define CONTENT_BROWSER_WEBUI_URL_DATA_MANAGER_H_
 
 #include <string>
 #include <vector>
 
-#include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/synchronization/lock.h"
-#include "chrome/browser/profiles/profile_keyed_service.h"
+#include "content/common/content_export.h"
 
 class ChromeURLDataManagerBackend;
 class MessageLoop;
-class Profile;
 
 namespace base {
 class RefCountedMemory;
 }
 
 namespace content {
+class BrowserContext;
 class URLDataSource;
 class WebUIDataSource;
 }
 
 class URLDataSourceImpl;
 
 // 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 : public ProfileKeyedService {
+class ChromeURLDataManager  {
  public:
-  explicit ChromeURLDataManager(
-      const base::Callback<ChromeURLDataManagerBackend*(void)>& backend);
+  explicit ChromeURLDataManager(content::BrowserContext* browser_context);
   virtual ~ChromeURLDataManager();
 
   // Adds a DataSource to the collection of data sources. This *must* be invoked
   // on the UI thread.
   //
   // If |AddDataSource| is called more than once for a particular name it will
   // release the old |DataSource|, most likely resulting in it getting deleted
   // as there are no other references to it. |DataSource| uses the
   // |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(URLDataSourceImpl* 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
+  // Convenience wrapper function to add |source| to |browser_context|'s
   // |ChromeURLDataManager|. Creates a URLDataSourceImpl to wrap the given
   // source.
-  static void AddDataSource(Profile* profile,
-                            content::URLDataSource* source);
+  CONTENT_EXPORT static void AddDataSource(
+      content::BrowserContext* browser_context,
+      content::URLDataSource* source);
 
-  // Adds a WebUI data source to |profile|'s |ChromeURLDataManager|.
-  static void AddWebUIDataSource(Profile* profile,
-                                 content::WebUIDataSource* source);
+  // Adds a WebUI data source to |browser_context|'s |ChromeURLDataManager|.
+  CONTENT_EXPORT static void AddWebUIDataSource(
+      content::BrowserContext* browser_context,
+      content::WebUIDataSource* source);
 
  private:
   friend class URLDataSourceImpl;
   friend struct DeleteURLDataSource;
   typedef std::vector<const URLDataSourceImpl*> URLDataSources;
 
   // 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 URLDataSourceImpl* data_source);
 
   // Returns true if |data_source| is scheduled for deletion (|DeleteDataSource|
   // was invoked).
   static bool IsScheduledForDeletion(const URLDataSourceImpl* 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_;
+  content::BrowserContext* browser_context_;
 
   // |data_sources_| that are no longer referenced and scheduled for deletion.
   // Protected by g_delete_lock in the .cc file.
   static URLDataSources* data_sources_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeURLDataManager);
 };
 
 // Trait used to handle deleting a URLDataSource. Deletion happens on the UI
 // thread.
@@ skipping 60 matching lines @@
   // A DataSource can be removed in two ways: the ChromeURLDataManagerBackend
   // is deleted, or another DataSource is registered with the same
   // name. backend_ should only be accessed on the IO thread.
   // This reference can't be via a scoped_refptr else there would be a cycle
   // between the backend and data source.
   ChromeURLDataManagerBackend* backend_;
 
   scoped_ptr<content::URLDataSource> source_;
 };
 
-#endif  // CHROME_BROWSER_UI_WEBUI_CHROME_URL_DATA_MANAGER_H_
+#endif  // CONTENT_BROWSER_WEBUI_URL_DATA_MANAGER_H_