| Index: chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
|
| diff --git a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
|
| index 27d0f69788e6ebdaf876bf6881b0bc344285b264..621ad5a076e633993521e649b99bf474815a92d1 100644
|
| --- a/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
|
| +++ b/chrome/browser/chromeos/login/signin/merge_session_throttling_utils.cc
|
| @@ -98,7 +98,7 @@ void UnblockProfile(Profile* profile) {
|
| }
|
| }
|
|
|
| -bool ShouldDelayRequest(content::WebContents* web_contents) {
|
| +bool ShouldDelayRequestForProfile(Profile* profile) {
|
| DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
|
|
| if (!user_manager::UserManager::Get()->IsUserLoggedIn()) {
|
| @@ -113,11 +113,6 @@ bool ShouldDelayRequest(content::WebContents* web_contents) {
|
| return false;
|
| }
|
|
|
| - content::BrowserContext* browser_context = web_contents->GetBrowserContext();
|
| - if (!browser_context)
|
| - return false;
|
| -
|
| - Profile* profile = Profile::FromBrowserContext(browser_context);
|
| if (!profile)
|
| return false;
|
|
|
| @@ -167,6 +162,15 @@ bool ShouldDelayRequest(content::WebContents* web_contents) {
|
| return false;
|
| }
|
|
|
| +bool ShouldDelayRequestForWebContents(content::WebContents* web_contents) {
|
| + content::BrowserContext* browser_context = web_contents->GetBrowserContext();
|
| + if (!browser_context)
|
| + return false;
|
| +
|
| + return ShouldDelayRequestForProfile(
|
| + Profile::FromBrowserContext(browser_context));
|
| +}
|
| +
|
| bool ShouldDelayUrl(const GURL& url) {
|
| // If we are loading google properties while merge session is in progress,
|
| // we will show delayed loading page instead.
|
|
|