[Cronet] Do not follow Http <-> Https redirects

components/cronet/android/java/src/org/chromium/net/urlconnection/CronetHttpURLConnection.java

 // Copyright 2014 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.
 
 package org.chromium.net.urlconnection;
 
 import android.util.Pair;
 
 import org.chromium.base.Log;
 import org.chromium.net.CronetEngine;
@@ skipping 421 matching lines @@
         public void onReadCompleted(
                 UrlRequest request, UrlResponseInfo info, ByteBuffer byteBuffer) {
             mResponseInfo = info;
             mMessageLoop.quit();
         }
 
         @Override
         public void onReceivedRedirect(
                 UrlRequest request, UrlResponseInfo info, String newLocationUrl) {
             mOnRedirectCalled = true;
-            if (instanceFollowRedirects) {
-                try {
-                    url = new URL(newLocationUrl);
-                } catch (MalformedURLException e) {
-                    // Ignored.
+            try {
+                URL newUrl = new URL(newLocationUrl);
+                boolean sameProtocol = newUrl.getProtocol().equals(url.getProtocol());
+                if (instanceFollowRedirects) {
+                    // Update the url variable even if the redirect will not be
+                    // followed due to different protocols.
+                    url = newUrl;
                 }
-                mRequest.followRedirect();
-            } else {
-                mResponseInfo = info;
-                mRequest.cancel();
-                setResponseDataCompleted();
+                if (instanceFollowRedirects && sameProtocol) {
+                    mRequest.followRedirect();
+                    return;
+                }
+            } catch (MalformedURLException e) {
+                // Ignored. Just cancel the request and not follow the redirect.
             }
+            mResponseInfo = info;
+            mRequest.cancel();
+            setResponseDataCompleted();
         }
 
         @Override
         public void onSucceeded(UrlRequest request, UrlResponseInfo info) {
             mResponseInfo = info;
             setResponseDataCompleted();
         }
 
         @Override
         public void onFailed(
@@ skipping 72 matching lines @@
     }
 
     /**
      * Returns whether the client has used {@link #setChunkedStreamingMode} to
      * set chunked encoding for upload.
      */
     private boolean isChunkedUpload() {
         return chunkLength > 0;
     }
 }