| Index: chrome/browser/media_galleries/fileapi/safe_audio_video_checker.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.cc b/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.cc
|
| index a27e6cf854ba5885d8d35ea1f33611160d28c881..8346f854736a2a99a4df89223b152064d4a0959a 100644
|
| --- a/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/safe_audio_video_checker.cc
|
| @@ -35,7 +35,7 @@ void SafeAudioVideoChecker::Start() {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
| if (state_ != INITIAL_STATE)
|
| return;
|
| - state_ = PINGED_STATE;
|
| + state_ = STARTED_STATE;
|
|
|
| if (!file_.IsValid()) {
|
| callback_.Run(base::File::FILE_ERROR_SECURITY);
|
| @@ -43,32 +43,25 @@ void SafeAudioVideoChecker::Start() {
|
| return;
|
| }
|
|
|
| - utility_process_host_ = content::UtilityProcessHost::Create(
|
| - this, base::ThreadTaskRunnerHandle::Get())->AsWeakPtr();
|
| - utility_process_host_->SetName(l10n_util::GetStringUTF16(
|
| - IDS_UTILITY_PROCESS_MEDIA_FILE_CHECKER_NAME));
|
| - utility_process_host_->Send(new ChromeUtilityMsg_StartupPing);
|
| -}
|
| -
|
| -SafeAudioVideoChecker::~SafeAudioVideoChecker() {}
|
| -
|
| -void SafeAudioVideoChecker::OnProcessStarted() {
|
| - DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
| - if (state_ != PINGED_STATE)
|
| - return;
|
| - state_ = STARTED_STATE;
|
| -
|
| IPC::PlatformFileForTransit file_for_transit =
|
| IPC::TakePlatformFileForTransit(std::move(file_));
|
| if (file_for_transit == IPC::InvalidPlatformFileForTransit()) {
|
| OnCheckingFinished(false /* valid? */);
|
| return;
|
| }
|
| +
|
| + utility_process_host_ = content::UtilityProcessHost::Create(
|
| + this, base::ThreadTaskRunnerHandle::Get())->AsWeakPtr();
|
| + utility_process_host_->SetName(l10n_util::GetStringUTF16(
|
| + IDS_UTILITY_PROCESS_MEDIA_FILE_CHECKER_NAME));
|
| +
|
| const int64_t kFileDecodeTimeInMS = 250;
|
| utility_process_host_->Send(new ChromeUtilityMsg_CheckMediaFile(
|
| kFileDecodeTimeInMS, file_for_transit));
|
| }
|
|
|
| +SafeAudioVideoChecker::~SafeAudioVideoChecker() {}
|
| +
|
| void SafeAudioVideoChecker::OnCheckingFinished(bool valid) {
|
| DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
|
| if (state_ != STARTED_STATE)
|
| @@ -86,8 +79,6 @@ void SafeAudioVideoChecker::OnProcessCrashed(int exit_code) {
|
| bool SafeAudioVideoChecker::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(SafeAudioVideoChecker, message)
|
| - IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ProcessStarted,
|
| - OnProcessStarted)
|
| IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_CheckMediaFile_Finished,
|
| OnCheckingFinished)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
|
|