Revert 79691 - Move WebUIFactory to chrome/browser.

chrome/browser/browser_url_handler.cc

 // 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.
 
 #include "chrome/browser/browser_url_handler.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/webui/web_ui.h"
+#include "content/browser/webui/web_ui_factory.h"
 #include "googleurl/src/gurl.h"
 
 // Handles rewriting view-source URLs for what we'll actually load.
 static bool HandleViewSource(GURL* url, Profile* profile) {
   if (url->SchemeIs(chrome::kViewSourceScheme)) {
     // Load the inner URL instead.
     *url = GURL(url->path());
 
     // Bug 26129: limit view-source to view the content and not any
     // other kind of 'active' url scheme like 'javascript' or 'data'.
@@ skipping 31 matching lines @@
   repl.SetScheme(chrome::kViewSourceScheme,
       url_parse::Component(0, strlen(chrome::kViewSourceScheme)));
   repl.SetPath(url->spec().c_str(),
       url_parse::Component(0, url->spec().size()));
   *url = url->ReplaceComponents(repl);
   return true;
 }
 
 // Handles rewriting Web UI URLs.
 static bool HandleWebUI(GURL* url, Profile* profile) {
-  if (!ChromeWebUIFactory::GetInstance()->UseWebUIForURL(profile, *url))
+  if (!WebUIFactory::UseWebUIForURL(profile, *url))
     return false;
 
   // Special case the new tab page. In older versions of Chrome, the new tab
   // page was hosted at chrome-internal:<blah>. This might be in people's saved
   // sessions or bookmarks, so we say any URL with that scheme triggers the new
   // tab page.
   if (url->SchemeIs(chrome::kChromeInternalScheme)) {
     // Rewrite it with the proper new tab URL.
     *url = GURL(chrome::kChromeUINewTabURL);
   }
@@ skipping 49 matching lines @@
     GURL test_url(original);
     if ((*url_handlers_[i].first)(&test_url, profile)) {
       if (url_handlers_[i].second)
         return (*url_handlers_[i].second)(url, profile);
       else
         return false;
     }
   }
   return false;
 }