Start splitting out WebUI into an implementation class and an interface that each page implements...

chrome/browser/ui/webui/conflicts_ui.h

Index: chrome/browser/ui/webui/conflicts_ui.h
===================================================================
--- chrome/browser/ui/webui/conflicts_ui.h	(revision 117388)
+++ chrome/browser/ui/webui/conflicts_ui.h	(working copy)
@@ -7,13 +7,14 @@
 #pragma once
 
 #include "content/browser/webui/web_ui.h"
+#include "content/public/browser/web_ui_controller.h"
 
 #if defined(OS_WIN)
 
 class RefCountedMemory;
 
 // The Web UI handler for about:conflicts.
-class ConflictsUI : public WebUI {
+class ConflictsUI : public WebUI, public content::WebUIController {
  public:
   explicit ConflictsUI(content::WebContents* contents);