Fix ChromeFrame net tests which have broken since revision 70089 which added ...

Fix ChromeFrame net tests which have broken since revision 70089 which added a named testing
interface to the automation provider. The testing automation provider was incorrectly
assuming that the tab handle would be a parameter in the TabLoaded message. This changed with
jam's change to clean up the automation messages used by chrome frame. The other bug was with the 
AutomationMsg_Hello message which was passing an incorrect protocol version to chrome frame. 

BUG=none
TEST=ChromeFrame net tests should run.

TBR=amit


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

[amit, 2011-01-14 16:12:07]

lg

On Fri, Jan 14, 2011 at 12:14 AM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Fix ChromeFrame net tests which have broken since revision 70089 which
> added a
> named testing
> interface to the automation provider. The testing automation provider was
> also
> incorrectly
> assuming that the tab handle would be a parameter in the TabLoaded message.
> This
> changed with
> jam's change to clean up the automation messages used by chrome frame.
>
> BUG=none
> TEST=ChromeFrame net tests should run.
>
> TBR=amit
>
>
> Please review this at http://codereview.chromium.org/6324002/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/test/net/test_automation_provider.cc
>
>
> Index: chrome_frame/test/net/test_automation_provider.cc
> ===================================================================
> --- chrome_frame/test/net/test_automation_provider.cc   (revision 71338)
> +++ chrome_frame/test/net/test_automation_provider.cc   (working copy)
> @@ -59,8 +59,7 @@
>  bool TestAutomationProvider::Send(IPC::Message* msg) {
>   if (msg->type() == AutomationMsg_TabLoaded::ID) {
>     DCHECK(tab_handle_ == -1) << "Currently only support one tab";
> -    void* iter = NULL;
> -    CHECK(msg->ReadInt(&iter, &tab_handle_));
> +    tab_handle_ = msg->routing_id();
>     DVLOG(1) << "Got tab handle: " << tab_handle_;
>     DCHECK(tab_handle_ != -1 && tab_handle_ != 0);
>     delegate_->OnInitialTabLoaded();
> @@ -120,6 +119,9 @@
>     TestAutomationProviderDelegate* delegate) {
>   TestAutomationProvider* automation = new TestAutomationProvider(p,
> delegate);
>   automation->InitializeChannel(channel);
> +  // Send a hello message with our current automation protocol version.
> +  automation->Send(
> +      new AutomationMsg_Hello(automation->GetProtocolVersion().c_str()));
>   automation->SetExpectedTabCount(1);
>   return automation;
>  }
>
>
>