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

content/browser/browsing_instance.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 "content/browser/browsing_instance.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/site_instance.h"
-#include "content/browser/webui/web_ui_factory.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/web_ui_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 
 // static
 base::LazyInstance<
     BrowsingInstance::ContextSiteInstanceMap,
     base::LeakyLazyInstanceTraits<BrowsingInstance::ContextSiteInstanceMap> >
         BrowsingInstance::context_site_instance_map_ =
             LAZY_INSTANCE_INITIALIZER;
 
@@ skipping 14 matching lines @@
   // it is in process-per-tab or process-per-site-instance.
   // Note that --single-process may have been specified, but that affects the
   // process creation logic in RenderProcessHost, so we do not need to worry
   // about it here.
 
   if (content::GetContentClient()->browser()->
       ShouldUseProcessPerSite(browser_context_, url))
     return true;
 
   // DevTools pages have WebUI type but should not reuse the same host.
-  if (content::WebUIFactory::Get()->UseWebUIForURL(browser_context_, url) &&
+  if (content::GetContentClient()->browser()->GetWebUIFactory()->
+          UseWebUIForURL(browser_context_, url) &&
       !url.SchemeIs(chrome::kChromeDevToolsScheme)) {
     return true;
   }
 
   // In all other cases, don't use process-per-site logic.
   return false;
 }
 
 BrowsingInstance::SiteInstanceMap* BrowsingInstance::GetSiteInstanceMap(
     content::BrowserContext* browser_context, const GURL& url) {
@@ skipping 90 matching lines @@
     return true;
   }
   return false;
 }
 
 BrowsingInstance::~BrowsingInstance() {
   // We should only be deleted when all of the SiteInstances that refer to
   // us are gone.
   DCHECK(site_instance_map_.empty());
 }