OAuth2LoginManager+MergeSessionThrottle hardening, multi-profle support

chrome/browser/renderer_host/chrome_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 "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 273 matching lines @@
 
 #if defined(OS_CHROMEOS)
   if (resource_type == ResourceType::MAIN_FRAME) {
     // We check offline first, then check safe browsing so that we still can
     // block unsafe site after we remove offline page.
     throttles->push_back(new OfflineResourceThrottle(request,
                                                      appcache_service));
     // 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
 
   // Don't attempt to append headers to requests that have already started.
   // TODO(stevet): Remove this once the request ordering issues are resolved
   // in crbug.com/128048.
   if (!request->is_pending()) {
     net::HttpRequestHeaders headers;
     headers.CopyFrom(request->extra_request_headers());
     bool incognito = io_data->is_incognito();
@@ skipping 337 matching lines @@
   if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) &&
       ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView(
           &child_id, &route_id) &&
       prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) {
     ReportUnsupportedPrerenderScheme(redirect_url);
     prerender_tracker_->TryCancel(
         child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME);
     request->Cancel();
   }
 }