Replace WebUI::tab_contents() with web_contents() and switch all users to use web_contents.h inst...

chrome/browser/ui/webui/conflicts_ui.cc

Index: chrome/browser/ui/webui/conflicts_ui.cc
===================================================================
--- chrome/browser/ui/webui/conflicts_ui.cc	(revision 116011)
+++ chrome/browser/ui/webui/conflicts_ui.cc	(working copy)
@@ -19,11 +19,11 @@
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -33,6 +33,7 @@
 #include "ui/base/resource/resource_bundle.h"
 
 using content::UserMetricsAction;
+using content::WebContents;
 
 namespace {
 
@@ -156,7 +157,7 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-ConflictsUI::ConflictsUI(TabContents* contents) : ChromeWebUI(contents) {
+ConflictsUI::ConflictsUI(WebContents* contents) : ChromeWebUI(contents) {
   content::RecordAction(UserMetricsAction("ViewAboutConflicts"));
   AddMessageHandler(new ConflictsDOMHandler());