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

chrome/browser/ui/webui/uber/uber_ui.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 "chrome/browser/ui/webui/uber/uber_ui.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 using content::WebContents;
 
 namespace {
 
 ChromeWebUIDataSource* CreateUberHTMLSource() {
   ChromeWebUIDataSource* source =
@@ skipping 25 matching lines @@
   RegisterSubpage(chrome::kChromeUISettingsFrameURL);
   RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
 }
 
 UberUI::~UberUI() {
   STLDeleteValues(&sub_uis_);
 }
 
 void UberUI::RegisterSubpage(const std::string& page_url) {
   WebUI* web_ui = ChromeWebUIFactory::GetInstance()->CreateWebUIForURL(
-          static_cast<TabContents*>(web_contents_), GURL(page_url));
+          web_contents_, GURL(page_url));
 
   web_ui->set_frame_xpath("//iframe[@src='" + page_url + "']");
   sub_uis_[page_url] = web_ui;
 }
 
 void UberUI::RenderViewCreated(RenderViewHost* render_view_host) {
   for (SubpageMap::iterator iter = sub_uis_.begin(); iter != sub_uis_.end();
        ++iter) {
     iter->second->RenderViewCreated(render_view_host);
   }
@@ skipping 26 matching lines @@
   SubpageMap::iterator subpage = sub_uis_.find(source_url.GetOrigin().spec());
   if (subpage == sub_uis_.end()) {
     // The message was sent from the uber page itself.
     DCHECK_EQ(std::string(chrome::kChromeUIUberHost), source_url.host());
     WebUI::OnWebUISend(source_url, message, args);
   } else {
     // The message was sent from a subpage.
     subpage->second->OnWebUISend(source_url, message, args);
   }
 }