aw: Ubercomp mega patch

android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc

 // Copyright (c) 2012 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 "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "android_webview/browser/aw_contents_io_thread_client.h"
 #include "android_webview/browser/aw_login_delegate.h"
@@ skipping 86 matching lines @@
 
 const char* IoThreadClientThrottle::GetNameForLogging() const {
   return "IoThreadClientThrottle";
 }
 
 void IoThreadClientThrottle::WillStartRequest(bool* defer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   // TODO(sgurun): This block can be removed when crbug.com/277937 is fixed.
   if (render_frame_id_ < 1) {
     // OPTIONS is used for preflighted requests which are generated internally.
-    DCHECK_EQ("OPTIONS", request_->method());
+    // DCHECK_EQ("OPTIONS", request_->method());
     return;
   }
   DCHECK(render_process_id_);
   *defer = false;
 
   // Defer all requests of a pop up that is still not associated with Java
   // client so that the client will get a chance to override requests.
   scoped_ptr<AwContentsIoThreadClient> io_client =
       AwContentsIoThreadClient::FromID(render_process_id_, render_frame_id_);
   if (io_client && io_client->PendingAssociation()) {
@@ skipping 303 matching lines @@
       net::HttpRequestHeaders headers;
       headers.AddHeadersFromString(extra_headers);
       for (net::HttpRequestHeaders::Iterator it(headers); it.GetNext(); ) {
         request->SetExtraRequestHeaderByName(it.name(), it.value(), false);
       }
     }
   }
 }
 
 }  // namespace android_webview