Fixes for the chrome frame npapi test failures seen on the builders. These fa...

chrome_frame/chrome_frame_npapi.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_NPAPI_H_
 #define CHROME_FRAME_CHROME_FRAME_NPAPI_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <string>
@@ skipping 115 matching lines @@
   bool GetProperty(NPIdentifier name, NPVariant *variant);
 
   // Initialize string->identifier mapping, public to allow unittesting.
   static void InitializeIdentifiers();
 
   bool PreProcessContextMenu(HMENU menu);
   bool HandleContextMenuCommand(UINT cmd, const MiniContextMenuParams& params);
  protected:
   // Handler for accelerator messages passed on from the hosted chrome
   // instance.
-  virtual void OnAcceleratorPressed(int tab_handle, const MSG& accel_message);
-  virtual void OnTabbedOut(int tab_handle, bool reverse);
-  virtual void OnOpenURL(int tab_handle, const GURL& url,
-                         const GURL& referrer, int open_disposition);
-  virtual void OnLoad(int tab_handle, const GURL& url);
-  virtual void OnMessageFromChromeFrame(int tab_handle,
-                                        const std::string& message,
+  virtual void OnAcceleratorPressed(const MSG& accel_message);
+  virtual void OnTabbedOut(bool reverse);
+  virtual void OnOpenURL(const GURL& url, const GURL& referrer,
+                         int open_disposition);
+  virtual void OnLoad(const GURL& url);
+  virtual void OnMessageFromChromeFrame(const std::string& message,
                                         const std::string& origin,
                                         const std::string& target);
   // ChromeFrameDelegate overrides
   virtual void OnLoadFailed(int error_code, const std::string& url);
   virtual void OnAutomationServerReady();
   virtual void OnAutomationServerLaunchFailed(
       AutomationLaunchResult reason, const std::string& server_version);
   virtual void OnExtensionInstalled(const FilePath& path,
       void* user_data, AutomationMsg_ExtensionResponseValues response);
   virtual void OnGetEnabledExtensionsComplete(
@@ skipping 192 matching lines @@
   // The value of src property keeping the current URL.
   std::string src_;
   // Used to fetch network resources when host network stack is in use.
   NPAPIUrlRequestManager url_fetcher_;
 
   // Set if we receive a navigation request before initializing Chrome.
   bool navigate_after_initialization_;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_NPAPI_H_