[Android WebView] Only send extra headers for the main page

content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java

Index: content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
index ba9619377f41b20f520741413c33d21838950125..3e17ae67dc97ed8932e5d9dc66f8e0aa52565ae7 100644
--- a/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
+++ b/content/public/android/java/src/org/chromium/content/browser/LoadUrlParams.java
@@ -219,17 +219,32 @@ public class LoadUrlParams {
      * NavigationController::LoadUrlParams::extra_headers.
      */
     String getExtraHeadersString() {
+        return getExtraHeadersString("\n", false);
+    }
+
+    /**
+     * Return the extra headers as a single String separated by "\r\n", or null if no extra header
+     * is set. This form is suitable for passing to native
+     * net::HttpRequestHeaders::AddHeadersFromString.
+     */
+    public String getExtraHttpRequestHeadersString() {
+        return getExtraHeadersString("\r\n", true);
+    }
+
+    private String getExtraHeadersString(String delimiter, boolean addTerminator) {
         if (mExtraHeaders == null) return null;
 
         StringBuilder headerBuilder = new StringBuilder();
         for (Map.Entry<String, String> header : mExtraHeaders.entrySet()) {
-            if (headerBuilder.length() > 0) headerBuilder.append("\n");
+            if (headerBuilder.length() > 0) headerBuilder.append(delimiter);
 
             // Header name should be lower case.
             headerBuilder.append(header.getKey().toLowerCase());
             headerBuilder.append(":");
             headerBuilder.append(header.getValue());
         }
+        if (addTerminator)
+            headerBuilder.append(delimiter);
 
         return headerBuilder.toString();
     }