Commit 4d370e2c authored by Min Qin's avatar Min Qin Committed by Commit Bot

Do a null check on BrowserContext in DownloadManagerService

DownloadManagerService may start too early before full browser is started.
In this case, downloadItem doesn't have a BrowserContext object assocuated,

BUG=695115

Change-Id: Ie7dcc88bb63cdfc8af0d0e4d4670e808e22f175e
Reviewed-on: https://chromium-review.googlesource.com/1140519Reviewed-by: default avatarShakti Sahu <shaktisahu@chromium.org>
Commit-Queue: Min Qin <qinmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#575863}
parent d252ebf5
......@@ -121,6 +121,8 @@ ScopedJavaLocalRef<jobject> DownloadManagerService::CreateJavaDownloadInfo(
bool time_remaining_known = item->TimeRemaining(&time_delta);
std::string original_url = item->GetOriginalUrl().SchemeIs(url::kDataScheme)
? std::string() : item->GetOriginalUrl().spec();
content::BrowserContext* browser_context =
content::DownloadItemUtils::GetBrowserContext(item);
return Java_DownloadInfo_createDownloadInfo(
env, ConvertUTF8ToJavaString(env, item->GetGuid()),
ConvertUTF8ToJavaString(env, item->GetFileNameToReportUser().value()),
......@@ -128,7 +130,7 @@ ScopedJavaLocalRef<jobject> DownloadManagerService::CreateJavaDownloadInfo(
ConvertUTF8ToJavaString(env, item->GetTabUrl().spec()),
ConvertUTF8ToJavaString(env, item->GetMimeType()),
item->GetReceivedBytes(), item->GetTotalBytes(),
content::DownloadItemUtils::GetBrowserContext(item)->IsOffTheRecord(),
browser_context ? false : browser_context->IsOffTheRecord(),
item->GetState(), item->PercentComplete(), item->IsPaused(),
has_user_gesture, item->CanResume(), item->IsParallelDownload(),
ConvertUTF8ToJavaString(env, original_url),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment