Revert 79691 - Move WebUIFactory to chrome/browser.

chrome/browser/ui/browser_navigator.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/ui/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 namespace {
 
 // Returns an appropriate SiteInstance for WebUI URLs, or the SiteInstance for
 // |source_contents| if it represents the same website as |url|.  Returns NULL
 // otherwise.
 SiteInstance* GetSiteInstance(TabContents* source_contents, Profile* profile,
                               const GURL& url) {
   // If url is a WebUI or extension, we need to be sure to use the right type
   // of renderer process up front.  Otherwise, we create a normal SiteInstance
   // as part of creating the tab.
-  if (ChromeWebUIFactory::GetInstance()->UseWebUIForURL(profile, url))
+  if (WebUIFactory::UseWebUIForURL(profile, url))
     return SiteInstance::CreateSiteInstanceForURL(profile, url);
 
   if (!source_contents)
     return NULL;
 
   // Don't use this logic when "--process-per-tab" is specified.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerTab) &&
       SiteInstance::IsSameWebSite(source_contents->profile(),
                                   source_contents->GetURL(),
                                   url)) {
@@ skipping 440 matching lines @@
           params->url, params->referrer, params->transition);
     }
 
     // If the singleton tab isn't already selected, select it.
     if (params->source_contents != params->target_contents)
       params->browser->SelectTabContentsAt(singleton_index, user_initiated);
   }
 }
 
 }  // namespace browser