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

Fixes for the chrome frame npapi test failures seen on the builders. These failures occurred
after the change to clean up chrome frame automation code. 

BUG=none
TEST=ChromeFrame firefox tests should pass.

TBR=jam

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=70172

[jam, 2010-12-26 21:45:09]

lgtm, thanks.  i had looked at the builders after, but i must have missed
the firefox tests

On Sat, Dec 25, 2010 at 9:16 AM, <ananta@chromium.org> wrote:

> Reviewers: John Abd-El-Malek,
>
> Description:
> Fixes for the chrome frame npapi test failures seen on the builders. These
> failures occurred
> after the change to clean up chrome frame automation code.
>
> BUG=none
> TEST=ChromeFrame firefox tests should pass.
>
> TBR=jam
>
> Please review this at http://codereview.chromium.org/6055008/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/chrome_frame_npapi.h
>  M     chrome_frame/chrome_frame_npapi.cc
>
>
> Index: chrome_frame/chrome_frame_npapi.cc
> ===================================================================
> --- chrome_frame/chrome_frame_npapi.cc  (revision 70168)
> +++ chrome_frame/chrome_frame_npapi.cc  (working copy)
> @@ -429,8 +429,7 @@
>   url_fetcher_.UrlNotify(url, reason, notify_data);
>  }
>
> -void ChromeFrameNPAPI::OnAcceleratorPressed(int tab_handle,
> -                                            const MSG& accel_message) {
> +void ChromeFrameNPAPI::OnAcceleratorPressed(const MSG& accel_message) {
>   DVLOG(1) << __FUNCTION__
>            << " msg:" << base::StringPrintf("0x%04X",
> accel_message.message)
>            << " key:" << accel_message.wParam;
> @@ -460,7 +459,7 @@
>   }
>  }
>
> -void ChromeFrameNPAPI::OnTabbedOut(int tab_handle, bool reverse) {
> +void ChromeFrameNPAPI::OnTabbedOut(bool reverse) {
>   DVLOG(1) << __FUNCTION__;
>
>   ignore_setfocus_ = true;
> @@ -477,8 +476,7 @@
>   ignore_setfocus_ = false;
>  }
>
> -void ChromeFrameNPAPI::OnOpenURL(int tab_handle,
> -                                 const GURL& url,
> +void ChromeFrameNPAPI::OnOpenURL(const GURL& url,
>                                  const GURL& referrer,
>                                  int open_disposition) {
>   std::string target;
> @@ -805,7 +803,7 @@
>   DVLOG(1) << __FUNCTION__;
>  }
>
> -void ChromeFrameNPAPI::OnLoad(int, const GURL& gurl) {
> +void ChromeFrameNPAPI::OnLoad(const GURL& gurl) {
>   DVLOG(1) << "Firing onload";
>   FireEvent("load", gurl.spec());
>  }
> @@ -817,8 +815,7 @@
>   InvokeDefault(onerror_handler_, url, &result);
>  }
>
> -void ChromeFrameNPAPI::OnMessageFromChromeFrame(int tab_handle,
> -                                                const std::string&
> message,
> +void ChromeFrameNPAPI::OnMessageFromChromeFrame(const std::string&
> message,
>                                                 const std::string& origin,
>                                                 const std::string& target)
> {
>   bool private_message = false;
> Index: chrome_frame/chrome_frame_npapi.h
> ===================================================================
> --- chrome_frame/chrome_frame_npapi.h   (revision 70168)
> +++ chrome_frame/chrome_frame_npapi.h   (working copy)
> @@ -133,13 +133,12 @@
>  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
>
>
>