Clean up Automation and Chrome Frame IPC code.

chrome_frame/chrome_frame_activex.cc

 // Copyright (c) 2010 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 "chrome_frame/chrome_frame_activex.h"
 
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 164 matching lines @@
 }
 
 HRESULT ChromeFrameActivex::GetDocumentWindow(IHTMLWindow2** window) {
   ScopedComPtr<IHTMLDocument2> document;
   HRESULT hr = GetContainingDocument(document.Receive());
   if (document)
     hr = document->get_parentWindow(window);
   return hr;
 }
 
-void ChromeFrameActivex::OnLoad(int tab_handle, const GURL& gurl) {
+void ChromeFrameActivex::OnLoad(const GURL& gurl) {
   ScopedComPtr<IDispatch> event;
   std::string url = gurl.spec();
   if (SUCCEEDED(CreateDomEvent("event", url, "", event.Receive())))
     Fire_onload(event);
 
   FireEvent(onload_, url);
-  Base::OnLoad(tab_handle, gurl);
+  Base::OnLoad(gurl);
 }
 
 void ChromeFrameActivex::OnLoadFailed(int error_code, const std::string& url) {
   ScopedComPtr<IDispatch> event;
   if (SUCCEEDED(CreateDomEvent("event", url, "", event.Receive())))
     Fire_onloaderror(event);
 
   FireEvent(onloaderror_, url);
   Base::OnLoadFailed(error_code, url);
 }
 
-void ChromeFrameActivex::OnMessageFromChromeFrame(int tab_handle,
-                                                  const std::string& message,
+void ChromeFrameActivex::OnMessageFromChromeFrame(const std::string& message,
                                                   const std::string& origin,
                                                   const std::string& target) {
   DVLOG(1) << __FUNCTION__;
 
   if (target.compare("*") != 0) {
     bool drop = true;
 
     if (is_privileged()) {
       // Forward messages if the control is in privileged mode.
       ScopedComPtr<IDispatch> message_event;
@@ skipping 471 matching lines @@
   if (FAILED(hr)) {
     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
                  << base::StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
                             base::win::ScopedVariant(bho));
   return S_OK;
 }