Supressing the referrer header in the automation url request job when going f...

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/renderer_host/render_view_host.h"
@@ skipping 302 matching lines @@
 
     NotifyReadComplete(bytes_to_copy);
   }
 }
 
 void URLRequestAutomationJob::OnRequestEnd(
     int tab, int id, const URLRequestStatus& status) {
   DLOG(INFO) << "URLRequestAutomationJob: " <<
       request_->url().spec() << " - request end. Status: " << status.status();
 
+  // TODO(tommi): When we hit certificate errors, notify the delegate via
+  // OnSSLCertificateError().  Right now we don't have the certificate
+  // so we don't.  We could possibly call OnSSLCertificateError with a NULL
+  // certificate, but I'm not sure if all implementations expect it.
+  // if (status.status() == URLRequestStatus::FAILED &&
+  //    net::IsCertificateError(status.os_error()) && request_->delegate()) {
+  //  request_->delegate()->OnSSLCertificateError(request_, status.os_error(),
+  //                                              NULL);
+  // }
+
   DisconnectFromMessageFilter();
   NotifyDone(status);
 
   // Reset any pending reads.
   if (pending_buf_) {
     pending_buf_ = NULL;
     pending_buf_size_ = 0;
     NotifyReadComplete(0);
   }
 }
@@ skipping 31 matching lines @@
   message_filter_->RegisterRequest(this);
 
   // Strip unwanted headers.
   std::string new_request_headers(
       net::HttpUtil::StripHeaders(request_->extra_request_headers(),
                                   kFilteredHeaderStrings,
                                   arraysize(kFilteredHeaderStrings)));
 
   // Ensure that we do not send username and password fields in the referrer.
   GURL referrer(request_->GetSanitizedReferrer());
-#ifndef NDEBUG
-  // The referrer header should be suppressed if the preceding URL was
+
+  // The referrer header must be suppressed if the preceding URL was
   // a secure one and the new one is not.
   if (referrer.SchemeIsSecure() && !request_->url().SchemeIsSecure()) {
-    DCHECK(referrer.spec().empty());
+    DLOG(INFO) <<
+        "Suppressing referrer header since going from secure to non-secure";
+    referrer = GURL();
   }
-#endif
 
   // Ask automation to start this request.
   IPC::AutomationURLRequest automation_request = {
     request_->url().spec(),
     request_->method(),
     referrer.spec(),
     new_request_headers,
     request_->get_upload()
   };
 
   DCHECK(message_filter_);
   message_filter_->Send(new AutomationMsg_RequestStart(0, tab_, id_,
       automation_request));
 }
 
 void URLRequestAutomationJob::DisconnectFromMessageFilter() {
   if (message_filter_) {
     message_filter_->UnRegisterRequest(this);
     message_filter_ = NULL;
   }
 }