From c9f20516ac0b1e83326eeca7fbc015b65a3add11 Mon Sep 17 00:00:00 2001
From: deepak1556 <hop2deep@gmail.com>
Date: Thu, 12 Apr 2018 13:36:23 +0530
Subject: [PATCH] Make reading blobs work through Blob mojo interface.

https://chromium-review.googlesource.com/c/chromium/src/+/773199
---
 atom/browser/atom_blob_reader.cc     | 8 +++-----
 atom/browser/atom_blob_reader.h      | 5 +----
 atom/browser/atom_browser_context.cc | 5 +----
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/atom/browser/atom_blob_reader.cc b/atom/browser/atom_blob_reader.cc
index 0ab7a270aa08..1fd883c2c117 100644
--- a/atom/browser/atom_blob_reader.cc
+++ b/atom/browser/atom_blob_reader.cc
@@ -11,7 +11,6 @@
 #include "storage/browser/blob/blob_data_handle.h"
 #include "storage/browser/blob/blob_reader.h"
 #include "storage/browser/blob/blob_storage_context.h"
-#include "storage/browser/fileapi/file_system_context.h"
 
 #include "atom/common/node_includes.h"
 
@@ -46,9 +45,8 @@ void RunCallbackInUI(const AtomBlobReader::CompletionCallback& callback,
 
 }  // namespace
 
-AtomBlobReader::AtomBlobReader(content::ChromeBlobStorageContext* blob_context,
-                               storage::FileSystemContext* file_system_context)
-    : blob_context_(blob_context), file_system_context_(file_system_context) {}
+AtomBlobReader::AtomBlobReader(content::ChromeBlobStorageContext* blob_context)
+    : blob_context_(blob_context) {}
 
 AtomBlobReader::~AtomBlobReader() {}
 
@@ -65,7 +63,7 @@ void AtomBlobReader::StartReading(
     return;
   }
 
-  auto blob_reader = blob_data_handle->CreateReader(file_system_context_.get());
+  auto blob_reader = blob_data_handle->CreateReader();
   BlobReadHelper* blob_read_helper =
       new BlobReadHelper(std::move(blob_reader), callback);
   blob_read_helper->Read();
diff --git a/atom/browser/atom_blob_reader.h b/atom/browser/atom_blob_reader.h
index 818d4be181fc..894d0fbe75ab 100644
--- a/atom/browser/atom_blob_reader.h
+++ b/atom/browser/atom_blob_reader.h
@@ -20,7 +20,6 @@ class IOBuffer;
 namespace storage {
 class BlobDataHandle;
 class BlobReader;
-class FileSystemContext;
 }  // namespace storage
 
 namespace v8 {
@@ -37,8 +36,7 @@ class AtomBlobReader {
  public:
   using CompletionCallback = base::Callback<void(v8::Local<v8::Value>)>;
 
-  AtomBlobReader(content::ChromeBlobStorageContext* blob_context,
-                 storage::FileSystemContext* file_system_context);
+  explicit AtomBlobReader(content::ChromeBlobStorageContext* blob_context);
   ~AtomBlobReader();
 
   void StartReading(const std::string& uuid,
@@ -69,7 +67,6 @@ class AtomBlobReader {
   };
 
   scoped_refptr<content::ChromeBlobStorageContext> blob_context_;
-  scoped_refptr<storage::FileSystemContext> file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(AtomBlobReader);
 };
diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc
index f4d6d5149c6f..301dcd1e4f6d 100644
--- a/atom/browser/atom_browser_context.cc
+++ b/atom/browser/atom_browser_context.cc
@@ -224,10 +224,7 @@ AtomBlobReader* AtomBrowserContext::GetBlobReader() {
   if (!blob_reader_.get()) {
     content::ChromeBlobStorageContext* blob_context =
         content::ChromeBlobStorageContext::GetFor(this);
-    storage::FileSystemContext* file_system_context =
-        content::BrowserContext::GetStoragePartition(this, nullptr)
-            ->GetFileSystemContext();
-    blob_reader_.reset(new AtomBlobReader(blob_context, file_system_context));
+    blob_reader_.reset(new AtomBlobReader(blob_context));
   }
   return blob_reader_.get();
 }