diff --git a/libcef/common/drag_data_impl.cc b/libcef/common/drag_data_impl.cc
index 88e79a1b8..b23f62a2c 100644
--- a/libcef/common/drag_data_impl.cc
+++ b/libcef/common/drag_data_impl.cc
@@ -96,9 +96,6 @@ CefString CefDragDataImpl::GetFragmentBaseURL() {
 
 CefString CefDragDataImpl::GetFileName() {
   base::AutoLock lock_scope(lock_);
-  if (data_.file_contents_content_disposition.empty())
-    return CefString();
-
   base::Optional<base::FilePath> filename =
       data_.GetSafeFilenameForImageFileContents();
   return filename ? CefString(filename->value()) : CefString();
diff --git a/tests/cefclient/browser/bytes_write_handler.cc b/tests/cefclient/browser/bytes_write_handler.cc
index d5349f6ea..2a745627c 100644
--- a/tests/cefclient/browser/bytes_write_handler.cc
+++ b/tests/cefclient/browser/bytes_write_handler.cc
@@ -77,7 +77,7 @@ int BytesWriteHandler::Flush() {
 }
 
 size_t BytesWriteHandler::Grow(size_t size) {
-  base::AutoLock lock_scope(lock_);
+  lock_.AssertAcquired();
   size_t rv;
   size_t s = (size > grow_ ? size : grow_);
   void* tmp = realloc(data_, datasize_ + s);