********** Chromium Blob hacking

chrome/browser/extensions/api/downloads/downloads_api_unittest.cc

Index: chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
===================================================================
--- chrome/browser/extensions/api/downloads/downloads_api_unittest.cc	(revision 183651)
+++ chrome/browser/extensions/api/downloads/downloads_api_unittest.cc	(working copy)
@@ -46,7 +46,7 @@
 #include "net/url_request/url_request_job_factory.h"
 #include "net/url_request/url_request_job_factory_impl.h"
 #include "webkit/blob/blob_data.h"
-#include "webkit/blob/blob_storage_controller.h"
+#include "webkit/blob/blob_storage_context.h"
 #include "webkit/blob/blob_url_request_job.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation.h"
@@ -622,12 +622,13 @@
   DISALLOW_COPY_AND_ASSIGN(ScopedItemVectorCanceller);
 };
 
+#if 0
 class TestProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   explicit TestProtocolHandler(
-      webkit_blob::BlobStorageController* blob_storage_controller,
+      webkit_blob::BlobStorageContext* blob_storage_context,
       fileapi::FileSystemContext* file_system_context)
-      : blob_storage_controller_(blob_storage_controller),
+      : blob_storage_context_(blob_storage_context),
         file_system_context_(file_system_context) {}
 
   virtual ~TestProtocolHandler() {}
@@ -638,13 +639,13 @@
     return new webkit_blob::BlobURLRequestJob(
         request,
         network_delegate,
-        blob_storage_controller_->GetBlobDataFromUrl(request->url()),
+        blob_storage_context_->GetBlobDataFromUrl(request->url()),
         file_system_context_,
         base::MessageLoopProxy::current());
   }
 
  private:
-  webkit_blob::BlobStorageController* const blob_storage_controller_;
+  webkit_blob::BlobStorageContext* const blob_storage_context_;
   fileapi::FileSystemContext* const file_system_context_;
 
   DISALLOW_COPY_AND_ASSIGN(TestProtocolHandler);
@@ -654,28 +655,36 @@
  public:
   explicit TestURLRequestContext(
       fileapi::FileSystemContext* file_system_context)
-      : blob_storage_controller_(new webkit_blob::BlobStorageController) {
+      : blob_storage_context_(new webkit_blob::BlobStorageContext) {
     // Job factory owns the protocol handler.
     job_factory_.SetProtocolHandler(
-        "blob", new TestProtocolHandler(blob_storage_controller_.get(),
+        "blob", new TestProtocolHandler(blob_storage_context_.get(),
                                         file_system_context));
     set_job_factory(&job_factory_);
   }
 
   virtual ~TestURLRequestContext() {}
 
-  webkit_blob::BlobStorageController* blob_storage_controller() const {
-    return blob_storage_controller_.get();
+  webkit_blob::BlobStorageContext* blob_storage_context() const {
+    return blob_storage_context_.get();
   }
 
  private:
   net::URLRequestJobFactoryImpl job_factory_;
-  scoped_ptr<webkit_blob::BlobStorageController> blob_storage_controller_;
+  scoped_ptr<webkit_blob::BlobStorageContext> blob_storage_context_;
 
   DISALLOW_COPY_AND_ASSIGN(TestURLRequestContext);
 };
 
 // TODO(benjhayden): Comment.
+//
+// TODO(michaeln): Wow, lots of complexity to create a filesystem file as a
+// precondition for the DownloadExtensionTest_Download_FileSystemURL.
+// Some alternatives come to mind:
+// - load an html page that will produce the file
+// - more directly write and  create the file using lower level
+//   fileapi::FileSystemFileUtilProxy to create the dir entry
+//   and  write directly into the platform file path using  base file_utils.
 class HTML5FileWriter {
  public:
   HTML5FileWriter(
@@ -705,6 +714,8 @@
 
   bool WriteFile() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    // TODO(michaeln): FSContext should not be used on the UI thread,
+    // this part of the sequence should also be invoked on the IO thread.
     fs_->OpenFileSystem(
         GURL(origin_),
         fileapi::kFileSystemTypeTemporary,
@@ -748,7 +759,7 @@
     CHECK_EQ(base::PLATFORM_FILE_OK, result);
     blob_data_->AppendData(payload_);
     url_request_context_.reset(new TestURLRequestContext(fs_));
-    url_request_context_->blob_storage_controller()->AddFinishedBlob(
+    url_request_context_->blob_storage_context()->AddFinishedBlob(
         blob_url(), blob_data_);
     operation()->Write(
         url_request_context_.get(),
@@ -782,7 +793,7 @@
 
   void TearDownURLRequestContext() {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-    url_request_context_->blob_storage_controller()->RemoveBlob(blob_url());
+    url_request_context_->blob_storage_context()->RemoveBlob(blob_url());
     url_request_context_.reset();
     CHECK(BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
         &HTML5FileWriter::NotifyURLRequestContextToreDown,
@@ -818,6 +829,7 @@
 const char HTML5FileWriter::kHTML5FileWritten[] = "html5_file_written";
 const char HTML5FileWriter::kURLRequestContextToreDown[] =
   "url_request_context_tore_down";
+#endif
 
 }  // namespace
 
@@ -2094,6 +2106,7 @@
                           result_id)));
 }
 
+#if 0
 // Test downloading filesystem: URLs.
 // NOTE: chrome disallows creating HTML5 FileSystem Files in incognito.
 IN_PROC_BROWSER_TEST_F(DownloadExtensionTest,
@@ -2145,3 +2158,4 @@
   EXPECT_TRUE(file_util::ReadFileToString(item->GetFullPath(), &disk_data));
   EXPECT_STREQ(kPayloadData, disk_data.c_str());
 }
+#endif