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

chrome_frame/test/net/test_automation_provider.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/test/net/test_automation_provider.h"
 
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "base/path_service.h"
 #include "chrome/common/automation_messages.h"
@@ skipping 41 matching lines @@
   if (automation_resource_message_filter_->OnMessageReceived(msg))
     return true;  // Message handled by the filter.
 
   return __super::OnMessageReceived(msg);
 }
 
 // IPC override to grab the tab handle.
 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();
   }
 
   return AutomationProvider::Send(msg);
 }
 
 net::URLRequestJob* TestAutomationProvider::Factory(net::URLRequest* request,
                                                     const std::string& scheme) {
@@ skipping 42 matching lines @@
 
 // static
 TestAutomationProvider* TestAutomationProvider::NewAutomationProvider(
     Profile* p, const std::string& channel,
     TestAutomationProviderDelegate* delegate) {
   TestAutomationProvider* automation = new TestAutomationProvider(p, delegate);
   automation->InitializeChannel(channel);
   automation->SetExpectedTabCount(1);
   return automation;
 }