Move WebUIFactory into content/public/browser and make it use WebContents instead of TabContents....

content/public/browser/web_ui_factory.h

Index: content/public/browser/web_ui_factory.h
===================================================================
--- content/public/browser/web_ui_factory.h	(revision 116681)
+++ content/public/browser/web_ui_factory.h	(working copy)
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_WEBUI_WEB_UI_FACTORY_H_
-#define CONTENT_BROWSER_WEBUI_WEB_UI_FACTORY_H_
+#ifndef CONTENT_PUBLIC_BROWSER_WEB_UI_FACTORY_H_
+#define CONTENT_PUBLIC_BROWSER_WEB_UI_FACTORY_H_
 #pragma once
 
 #include "content/browser/webui/web_ui.h"
 #include "content/common/content_export.h"
 
-class TabContents;
 class GURL;
 
 namespace content {
 
 class BrowserContext;
+class WebContents;
 
 // Interface for an object which controls which URLs are considered WebUI URLs
 // and creates WebUI instances for given URLs.
@@ -22,21 +22,21 @@
  public:
   // Returns a WebUI instance for the given URL, or NULL if the URL doesn't
   // correspond to a WebUI.
-  virtual WebUI* CreateWebUIForURL(TabContents* source,
+  virtual WebUI* CreateWebUIForURL(WebContents* source,
                                    const GURL& url) const = 0;
 
   // Gets the WebUI type for the given URL. This will return kNoWebUI if the
   // corresponding call to CreateWebUIForURL would fail, or something non-NULL
   // if CreateWebUIForURL would succeed.
-  virtual WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context,
+  virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
                                      const GURL& url) const = 0;
 
   // Shorthand for the above, but returns a simple yes/no.
-  virtual bool UseWebUIForURL(content::BrowserContext* browser_context,
+  virtual bool UseWebUIForURL(BrowserContext* browser_context,
                               const GURL& url) const = 0;
 
   // Returns true for the subset of WebUIs that actually need WebUI bindings.
-  virtual bool UseWebUIBindingsForURL(content::BrowserContext* browser_context,
+  virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
                                       const GURL& url) const = 0;
 
   // Returns true if the url has a scheme for WebUI. This differs from the above
@@ -47,17 +47,12 @@
   // Returns true if the given URL can be loaded by Web UI system. This allows
   // URLs with WebUI types (as above) and also URLs that can be loaded by
   // normal tabs such as javascript: URLs or about:hang.
-  virtual bool IsURLAcceptableForWebUI(content::BrowserContext* browser_context,
+  virtual bool IsURLAcceptableForWebUI(BrowserContext* browser_context,
                                        const GURL& url) const = 0;
 
   virtual ~WebUIFactory() {}
-
-  // Helper function to streamline retrieval of the current WebUIFactory. Only
-  // to be used in content/. Guaranteed to return non-NULL.
-  static WebUIFactory* Get();
 };
 
-
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_WEBUI_WEB_UI_FACTORY_H_
+#endif  // CONTENT_PUBLIC_BROWSER_WEB_UI_FACTORY_H_