ChromeFrame HTTP requests would randomly fail if we navigated to multiple HTT...

chrome/browser/automation/url_request_automation_job.cc

 // 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.
 
 #include "chrome/browser/automation/url_request_automation_job.h"
 
 #include "base/message_loop.h"
 #include "base/time.h"
 #include "chrome/browser/automation/automation_resource_message_filter.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 34 matching lines @@
 bool URLRequestAutomationJob::is_protocol_factory_registered_ = false;
 
 URLRequest::ProtocolFactory* URLRequestAutomationJob::old_http_factory_
     = NULL;
 URLRequest::ProtocolFactory* URLRequestAutomationJob::old_https_factory_
     = NULL;
 
 URLRequestAutomationJob::URLRequestAutomationJob(URLRequest* request, int tab,
     int request_id, AutomationResourceMessageFilter* filter)
     : URLRequestJob(request),
-      id_(request_id),
       tab_(tab),
       message_filter_(filter),
       pending_buf_size_(0),
-      redirect_status_(0) {
+      redirect_status_(0),
+      request_id_(request_id) {
   DLOG(INFO) << "URLRequestAutomationJob create. Count: " << ++instance_count_;
-  DCHECK_NE(id_, -1);
+  DCHECK(message_filter_ != NULL);
+
+  if (message_filter_) {
+    id_ = message_filter_->NewAutomationRequestId();
+    DCHECK_NE(id_, 0);
+  }
 }
 
 URLRequestAutomationJob::~URLRequestAutomationJob() {
   DLOG(INFO) << "URLRequestAutomationJob delete. Count: " << --instance_count_;
   Cleanup();
 }
 
 bool URLRequestAutomationJob::EnsureProtocolFactoryRegistered() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
 
@@ skipping 138 matching lines @@
 }
 
 bool URLRequestAutomationJob::MayFilterMessage(const IPC::Message& message,
                                                int* request_id) {
   switch (message.type()) {
     case AutomationMsg_RequestStarted::ID:
     case AutomationMsg_RequestData::ID:
     case AutomationMsg_RequestEnd::ID: {
       void* iter = NULL;
       int tab = 0;
-      if (message.ReadInt(&iter, &tab) && message.ReadInt(&iter, request_id)) {
+      if (message.ReadInt(&iter, &tab) &&
+          message.ReadInt(&iter, request_id)) {
         return true;
       }
       break;
     }
   }
 
   return false;
 }
 
 void URLRequestAutomationJob::OnMessage(const IPC::Message& message) {
@@ skipping 194 matching lines @@
   message_filter_->Send(new AutomationMsg_RequestStart(0, tab_, id_,
       automation_request));
 }
 
 void URLRequestAutomationJob::DisconnectFromMessageFilter() {
   if (message_filter_) {
     message_filter_->UnRegisterRequest(this);
     message_filter_ = NULL;
   }
 }