Clean up Automation and Chrome Frame IPC code.

chrome_frame/chrome_frame_npapi.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_npapi.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
@@ skipping 883 matching lines @@
   // there are 2 CFs created for each tab (so we decide on the CEEE side
   // whether to show a warning). In FF however, there is only one privileged
   // CF instance per Firefox window, so OK to show the warning there without
   // any further logic.
   if (reason == AUTOMATION_VERSION_MISMATCH) {
     THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.VersionMismatchDisplayed", 1);
     DisplayVersionMismatchWarning(m_hWnd, server_version);
   }
 }
 
-void ChromeFrameNPAPI::OnCloseTab(int tab_handle) {
+void ChromeFrameNPAPI::OnCloseTab() {
   std::string arg;
   FireEvent("close", arg);
   ScopedNpVariant result;
   InvokeDefault(onclose_handler_, arg, &result);
 }
 
 bool ChromeFrameNPAPI::InvokeDefault(NPObject* object,
                                      unsigned param_count,
                                      const NPVariant* params,
                                      NPVariant* result) {
@@ skipping 565 matching lines @@
 bool ChromeFrameNPAPI::PreProcessContextMenu(HMENU menu) {
   // TODO: Remove this overridden method once HandleContextMenuCommand
   // implements "About Chrome Frame" handling.
   if (!is_privileged()) {
     // Call base class (adds 'About' item).
     return ChromeFramePlugin::PreProcessContextMenu(menu);
   }
   return true;
 }
 
-bool ChromeFrameNPAPI::HandleContextMenuCommand(UINT cmd,
-    const IPC::MiniContextMenuParams& params) {
+bool ChromeFrameNPAPI::HandleContextMenuCommand(
+    UINT cmd, const MiniContextMenuParams& params) {
   if (cmd == IDC_ABOUT_CHROME_FRAME) {
     // TODO: implement "About Chrome Frame"
   }
   return false;
 }
 
 NPError ChromeFrameNPAPI::NewStream(NPMIMEType type, NPStream* stream,
                                     NPBool seekable, uint16* stream_type) {
   return url_fetcher_.NewStream(type, stream, seekable, stream_type);
 }
 
 int32 ChromeFrameNPAPI::WriteReady(NPStream* stream) {
   return url_fetcher_.WriteReady(stream);
 }
 
 int32 ChromeFrameNPAPI::Write(NPStream* stream, int32 offset, int32 len,
                               void* buffer) {
   return url_fetcher_.Write(stream, offset, len, buffer);
 }
 
 NPError ChromeFrameNPAPI::DestroyStream(NPStream* stream, NPReason reason) {
   return url_fetcher_.DestroyStream(stream, reason);
 }