summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-09-13 13:41:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-31 13:44:54 +0200
commit75669bc49874b7bbcaba79fd7f4bd4e102f41065 (patch)
tree4f272027e42c3f8da2027a54d238ac90688d40e4
parent5210d8c24ceaac5a4209a66434ca43560abffc47 (diff)
downloadqtwebengine-chromium-75669bc49874b7bbcaba79fd7f4bd4e102f41065.tar.gz
Fix assert in Flash and incognito mode
Changes the assert to a logged error. Task-number: QTBUG-50566 Change-Id: I70f315553bfde53db3b4c4b57cf46f2f42c4260d Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io> Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
-rw-r--r--chromium/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc b/chromium/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
index 6f030773518..7f08a93b63d 100644
--- a/chromium/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
+++ b/chromium/content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
@@ -55,7 +55,7 @@ PepperFlashFileMessageFilter::PepperFlashFileMessageFilter(
// will construct a bad path and could provide access to the wrong files.
// In this case, |plugin_data_directory_| will remain unset and
// |ValidateAndConvertPepperFilePath| will fail.
- NOTREACHED();
+ DLOG(ERROR) << "Pepper Flash file access attemped with no data path";
} else {
plugin_data_directory_ = GetDataDirName(profile_data_directory).Append(
base::FilePath::FromUTF8Unsafe(plugin_name));