SSL Fix: Step 3....

chrome/browser/ssl/ssl_manager.cc

 // Copyright (c) 2006-2008 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/ssl/ssl_manager.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
@@ skipping 446 matching lines @@
 
   // A certificate error occurred.  Construct a CertError object and hand it
   // over to the UI thread for processing.
   ui_loop->PostTask(FROM_HERE,
       NewRunnableMethod(new CertError(rdh, request, info->resource_type,
                                       cert_error, cert, ui_loop),
                         &CertError::Dispatch));
 }
 
 // static
-void SSLManager::OnMixedContentRequest(ResourceDispatcherHost* rdh,
-                                       URLRequest* request,
-                                       MessageLoop* ui_loop) {
+bool SSLManager::ShouldStartRequest(ResourceDispatcherHost* rdh,
+                                    URLRequest* request,
+                                    MessageLoop* ui_loop) {
+  ResourceDispatcherHost::ExtraRequestInfo* info =
+      ResourceDispatcherHost::ExtraInfoForRequest(request);
+  DCHECK(info);
+
+  // We cheat here and talk to the SSLPolicy on the IO thread because we need
+  // to respond synchronously to avoid delaying all network requests...
+  if (!SSLPolicy::IsMixedContent(request->url(),
+                                 info->resource_type,
+                                 info->main_frame_origin))
+    return true;
+
+
   ui_loop->PostTask(FROM_HERE,
       NewRunnableMethod(new MixedContentHandler(rdh, request, ui_loop),
                         &MixedContentHandler::Dispatch));
+  return false;
 }
 
 void SSLManager::OnCertError(CertError* error) {
   // Ask our delegate to deal with the error.
   NavigationEntry* entry = controller_->GetActiveEntry();
   // We might not have a navigation entry in some cases (e.g. when a
   // HTTPS page opens a popup with no URL and then populate it with
   // document.write()). See bug http://crbug.com/3845.
   if (!entry)
     return;
@@ skipping 240 matching lines @@
   }
 
   if (ca_name) {
     // TODO(wtc): should we show the root CA's name instead?
     *ca_name = l10n_util::GetStringF(
         IDS_SECURE_CONNECTION_EV_CA,
         UTF8ToWide(cert.issuer().organization_names[0]));
   }
   return true;
 }