Rename WebUIFactory to WebUIControllerFactory since that's what it creates now.

content/browser/browsing_instance.cc

 // 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.
 
 #include "content/browser/browsing_instance.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/site_instance_impl.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/browser/web_ui_controller_factory.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 
 using content::SiteInstance;
+using content::WebUIControllerFactory;
 
 // static
 base::LazyInstance<BrowsingInstance::ContextSiteInstanceMap>::Leaky
     BrowsingInstance::context_site_instance_map_ = LAZY_INSTANCE_INITIALIZER;
 
 BrowsingInstance::BrowsingInstance(content::BrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
 
 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 (content::GetContentClient()->browser()->
       ShouldUseProcessPerSite(browser_context_, url))
     return true;
 
   // DevTools pages have WebUI type but should not reuse the same host.
-  if (content::GetContentClient()->browser()->GetWebUIFactory()->
-          UseWebUIForURL(browser_context_, url) &&
+  WebUIControllerFactory* factory =
+      content::GetContentClient()->browser()->GetWebUIControllerFactory();
+  if (factory && factory->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 93 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());
 }