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

content/browser/mock_content_browser_client.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/mock_content_browser_client.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/logging.h"
-#include "content/browser/webui/empty_web_ui_factory.h"
 #include "content/test/test_web_contents_view.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "webkit/glue/webpreferences.h"
 
 namespace content {
 
 MockContentBrowserClient::MockContentBrowserClient() {
 }
@@ skipping 12 matching lines @@
 }
 
 void MockContentBrowserClient::RenderViewHostCreated(
     RenderViewHost* render_view_host) {
 }
 
 void MockContentBrowserClient::RenderProcessHostCreated(
     RenderProcessHost* host) {
 }
 
-WebUIFactory* MockContentBrowserClient::GetWebUIFactory() {
-  // Return an empty factory so callsites don't have to check for NULL.
-  return EmptyWebUIFactory::GetInstance();
+WebUIControllerFactory* MockContentBrowserClient::GetWebUIControllerFactory() {
+  return NULL;
 }
 
 GURL MockContentBrowserClient::GetEffectiveURL(
     content::BrowserContext* browser_context, const GURL& url) {
   return url;
 }
 
 bool MockContentBrowserClient::ShouldUseProcessPerSite(
     BrowserContext* browser_context, const GURL& effective_url) {
   return false;
@@ skipping 251 matching lines @@
 #endif
 
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     MockContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
   return NULL;
 }
 #endif
 
 }  // namespace content