Move GenericHandler back to Chrome since it was really Chrome specific (i.e. chrome's mapping of cl…

content/browser/webui/web_ui_impl.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 "content/browser/webui/web_ui_impl.h"
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/browser/webui/generic_handler.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui_controller.h"
+#include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/common/bindings_policy.h"
 #include "ui/base/ui_base_switches.h"
 
 using content::WebContents;
 using content::WebUIController;
 using content::WebUIMessageHandler;
 
 namespace content {
 
 const WebUI::TypeID WebUI::kNoWebUI = NULL;
@@ skipping 18 matching lines @@
 }
 
 WebUIImpl::WebUIImpl(WebContents* contents)
     : hide_favicon_(false),
       focus_location_bar_by_default_(false),
       should_hide_url_(false),
       link_transition_type_(content::PAGE_TRANSITION_LINK),
       bindings_(content::BINDINGS_POLICY_WEB_UI),
       web_contents_(contents) {
   DCHECK(contents);
-  AddMessageHandler(new GenericHandler());
 }
 
 WebUIImpl::~WebUIImpl() {
   // Delete the controller first, since it may also be keeping a pointer to some
   // of the handlers and can call them at destruction.
   controller_.reset();
   STLDeleteContainerPointers(handlers_.begin(), handlers_.end());
 }
 
 // WebUIImpl, public: ----------------------------------------------------------
@@ skipping 188 matching lines @@
   DCHECK(!handler->web_ui());
   handler->set_web_ui(this);
   handler->RegisterMessages();
   handlers_.push_back(handler);
 }
 
 void WebUIImpl::ExecuteJavascript(const string16& javascript) {
   web_contents_->GetRenderViewHost()->ExecuteJavascriptInWebFrame(
       ASCIIToUTF16(frame_xpath_), javascript);
 }