Move WebUIFactory to chrome/browser.

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 "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/content_browser_client.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/webui/web_ui_factory.h"
+#include "content/common/content_client.h"
 
 // static
 BrowsingInstance::ProfileSiteInstanceMap
     BrowsingInstance::profile_site_instance_map_;
 
 BrowsingInstance::BrowsingInstance(Profile* profile)
     : profile_(profile) {
 }
 
 bool BrowsingInstance::ShouldUseProcessPerSite(const GURL& url) {
   // Returns true if we should use the process-per-site model.  This will be
   // the case if the --process-per-site switch is specified, or in
   // process-per-site-instance for particular sites (e.g., the new tab page).
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kProcessPerSite))
     return true;
 
   // We want to consolidate particular sites like extensions and WebUI whether
   // 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 (url.SchemeIs(chrome::kExtensionScheme))
     return true;
 
   // DevTools pages have WebUI type but should not reuse the same host.
-  if (WebUIFactory::UseWebUIForURL(profile_, url) &&
-      !url.SchemeIs(chrome::kChromeDevToolsScheme))
+  if (content::GetContentClient()->browser()->GetWebUIFactory()->

[jam, 2011/03/25 02:10:02]

content::GetContentClient()->browser()->GetWebUIFactory()

is a little long to repeat in a bunch of places.  can we have WebUI::Get() or
something similar that does this?

[Evan Stade, 2011/03/29 00:14:17]

Done.

+          UseWebUIForURL(profile_, url) &&
+      !url.SchemeIs(chrome::kChromeDevToolsScheme)) {
     return true;
+  }
 
   // In all other cases, don't use process-per-site logic.
   return false;
 }
 
 BrowsingInstance::SiteInstanceMap* BrowsingInstance::GetSiteInstanceMap(
     Profile* profile, const GURL& url) {
   if (!ShouldUseProcessPerSite(SiteInstance::GetEffectiveURL(profile, url))) {
     // Not using process-per-site, so use a map specific to this instance.
     return &site_instance_map_;
@@ skipping 85 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());
 }