Switch chrome code to use content::WebUI interface instead of WebUI concrete class. The latter will be renamed to WebUIImpl in a followup change. This completes hiding WebUI from chrome code, and now we can block it through DEPS.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9241032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118038 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 9 deletions

diff --git a/chrome/browser/ui/webui/media/media_internals_handler.cc b/chrome/browser/ui/webui/media/media_internals_handler.cc
index 86bf10c..63508ed 100644
--- a/chrome/browser/ui/webui/media/media_internals_handler.cc
+++ b/chrome/browser/ui/webui/media/media_internals_handler.cc
@@ -10,9 +10,9 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/webui/media/media_internals_proxy.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_ui.h"
 
 using content::BrowserThread;
 
@@ -38,7 +38,7 @@ void MediaInternalsMessageHandler::OnGetEverything(const ListValue* list) {
 
 void MediaInternalsMessageHandler::OnUpdate(const string16& update) {
   // Don't try to execute JavaScript in a RenderView that no longer exists.
-  RenderViewHost* host = web_ui()->web_contents()->GetRenderViewHost();
+  RenderViewHost* host = web_ui()->GetWebContents()->GetRenderViewHost();
   if (host)
     host->ExecuteJavascriptInWebFrame(string16(), update);
 }
diff --git a/chrome/browser/ui/webui/media/media_internals_proxy.cc b/chrome/browser/ui/webui/media/media_internals_proxy.cc
index 47f27c4..ded21ce 100644
--- a/chrome/browser/ui/webui/media/media_internals_proxy.cc
+++ b/chrome/browser/ui/webui/media/media_internals_proxy.cc
@@ -9,10 +9,10 @@
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/media/media_internals.h"
 #include "chrome/browser/ui/webui/media/media_internals_handler.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/browser/web_ui.h"
 
 using content::BrowserThread;
 
@@ -187,6 +187,6 @@ void MediaInternalsProxy::CallJavaScriptFunctionOnUIThread(
   scoped_ptr<Value> args_value(args);
   std::vector<const Value*> args_vector;
   args_vector.push_back(args_value.get());
-  string16 update = WebUI::GetJavascriptCall(function, args_vector);
+  string16 update = content::WebUI::GetJavascriptCall(function, args_vector);
   UpdateUIOnUIThread(update);
 }
diff --git a/chrome/browser/ui/webui/media/media_internals_ui.cc b/chrome/browser/ui/webui/media/media_internals_ui.cc
index f6dbd83..89a687f 100644
--- a/chrome/browser/ui/webui/media/media_internals_ui.cc
+++ b/chrome/browser/ui/webui/media/media_internals_ui.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/webui/media/media_internals_handler.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -39,12 +39,11 @@ ChromeWebUIDataSource* CreateMediaInternalsHTMLSource() {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-MediaInternalsUI::MediaInternalsUI(WebUI* web_ui)
+MediaInternalsUI::MediaInternalsUI(content::WebUI* web_ui)
     : WebUIController(web_ui) {
   web_ui->AddMessageHandler(new MediaInternalsMessageHandler());
 
-  Profile* profile = Profile::FromBrowserContext(
-      web_ui->web_contents()->GetBrowserContext());
+  Profile* profile = Profile::FromWebUI(web_ui);
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateMediaInternalsHTMLSource());
 }
diff --git a/chrome/browser/ui/webui/media/media_internals_ui.h b/chrome/browser/ui/webui/media/media_internals_ui.h
index 36ef325..b8e343c 100644
--- a/chrome/browser/ui/webui/media/media_internals_ui.h
+++ b/chrome/browser/ui/webui/media/media_internals_ui.h
@@ -11,7 +11,7 @@
 // The implementation for the chrome://media-internals page.
 class MediaInternalsUI : public content::WebUIController {
  public:
-  explicit MediaInternalsUI(WebUI* web_ui);
+  explicit MediaInternalsUI(content::WebUI* web_ui);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaInternalsUI);