Simplify WebUIMessageHandler a bit in preparation for moving it into the Content API:

-got rid of the Attach function which could be overridden by subclasses. Apart from not fitting in with the pure virtual function convention of the Content API, it was redundant to have it and RegisterMessages, since any initialization could be done in the latter.
-made WebUI::AddMessageHandler automatically set the WebUI object on WebUIMessageHandler and call RegisterMessages. It seemed busy work to require every user of WebUIMessageHandler to both add it to the WebUI object and also tell the WebUIMessageHandler about the WebUI.
-removed the usage of the web_ui_ member variable and switched all callers to use web_ui() instead
-made the helper functions static to make it clear that they don't depend on the object

In followup changes, I'll move WebUIMessageHandler to a separate file in content/public/browser and put it in the content namespace.

BUG=98716
Review URL: http://codereview.chromium.org/8968031

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

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/test/data/webui/async_gen.cc b/chrome/test/data/webui/async_gen.cc
index 1291bbd..d69fe6f 100644
--- a/chrome/test/data/webui/async_gen.cc
+++ b/chrome/test/data/webui/async_gen.cc
@@ -22,14 +22,14 @@ void WebUIBrowserAsyncGenTest::AsyncWebUIMessageHandler::HandleCallJS(
     const base::ListValue* list_value) {
   std::string call_js;
   ASSERT_TRUE(list_value->GetString(0, &call_js));
-  web_ui_->CallJavascriptFunction(call_js);
+  web_ui()->CallJavascriptFunction(call_js);
 }
 
 void WebUIBrowserAsyncGenTest::AsyncWebUIMessageHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "callJS", base::Bind(&AsyncWebUIMessageHandler::HandleCallJS,
                            base::Unretained(this)));
-  web_ui_->RegisterMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "tearDown", base::Bind(&AsyncWebUIMessageHandler::HandleTearDown,
                              base::Unretained(this)));
 }
diff --git a/chrome/test/data/webui/chrome_send_browsertest.cc b/chrome/test/data/webui/chrome_send_browsertest.cc
index b835d98..0c29554 100644
--- a/chrome/test/data/webui/chrome_send_browsertest.cc
+++ b/chrome/test/data/webui/chrome_send_browsertest.cc
@@ -20,7 +20,7 @@ ChromeSendWebUITest::ChromeSendWebUIMessageHandler::
     ~ChromeSendWebUIMessageHandler() {}
 
 void ChromeSendWebUITest::ChromeSendWebUIMessageHandler::RegisterMessages() {
-  web_ui_->RegisterMessageCallback(
+  web_ui()->RegisterMessageCallback(
       "checkSend",
       base::Bind(&ChromeSendWebUIMessageHandler::HandleCheckSend,
                  base::Unretained(this)));