OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index d1ae4e58cf280b0c9b325036ed6fdfb996097297..c9de2fa7abeecb2c8ba03b6e3d96acf29f86c4fb 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -291,7 +291,10 @@ void ChromeResourceDispatcherHostDelegate::RequestBeginning(
     // Add interstitial page while merge session process (cookie
     // reconstruction from OAuth2 refresh token in ChromeOS login) is still in
     // progress while we are attempting to load a google property.
-    throttles->push_back(new MergeSessionThrottle(request));
+    if (!MergeSessionThrottle::AreAllSessionMergedAlready() &&
+        request->url().SchemeIsHTTPOrHTTPS()) {
+      throttles->push_back(new MergeSessionThrottle(request));
+    }
   }
 #endif