Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3115)

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2157153003: Call WillStartRequestForTesting in TestRenderFrameHost (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just null check nav handle Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 40d34b4c02ae41148ecfdfff1ee5263abe7d9efe..889c4b9faa487a5c7d665e4f10b0730f3c0347c7 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2948,7 +2948,8 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
// 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.
- if (!merge_session_throttling_utils::AreAllSessionMergedAlready() &&
+ if (merge_session_throttling_utils::ShouldAttachNavigationThrottle() &&
+ !merge_session_throttling_utils::AreAllSessionMergedAlready() &&
handle->GetURL().SchemeIsHTTPOrHTTPS()) {
throttles.push_back(MergeSessionNavigationThrottle::Create(handle));
}
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/signin/merge_session_throttling_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698