Create blobs from Disk Cache entries.

content/browser/cache_storage/cache_storage_cache_unittest.cc

Index: content/browser/cache_storage/cache_storage_cache_unittest.cc
diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc
index 6a9ce3dbc1abe55a4eeb5d6a417a2cd453604bf2..286d41b5108e9fb5721c3c1ca12459e026111ded 100644
--- a/content/browser/cache_storage/cache_storage_cache_unittest.cc
+++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc
@@ -19,6 +19,7 @@
 #include "content/public/common/referrer.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "net/base/test_completion_callback.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job_factory_impl.h"
@@ -375,10 +376,32 @@ class CacheStorageCacheTest : public testing::Test {
   }
 
   void CopyBody(storage::BlobDataHandle* blob_handle, std::string* output) {
+    *output = std::string();
     scoped_ptr<storage::BlobDataSnapshot> data = blob_handle->CreateSnapshot();
     const auto& items = data->items();
     for (const auto& item : items) {
-      output->append(item->bytes(), item->length());
+      switch (item->type()) {
+        case storage::DataElement::TYPE_BYTES: {

[jkarlin, 2015/06/12 15:53:37]

I don't think you need to support TYPE_BYTES at this point.

[gavinp, 2015/06/12 18:10:30]

Lots of the tests use AppendData(); and so a lot of tests would need rewriting
if we didn't support it here. Since we're trying to read from Blobs, I think
it's maybe better to keep the more conveniently written tests using
AppendData(), and have this special case here...

+          output->append(item->bytes(), item->length());
+        } break;

[jkarlin, 2015/06/12 15:53:37]

I realize the break after the } is semantically correct but it doesn't follow
the rest of this directory, and it doesn't follow examples in the style guide:
https://google-styleguide.googlecode.com/svn/trunk/cppguide.html#Loops_and_Sw...

[gavinp, 2015/06/12 18:10:30]

Done. I was probably just used to editing some of the IPC parsers at this point
which use that style pervasively.

+        case storage::DataElement::TYPE_DISK_CACHE_ENTRY: {
+          disk_cache::Entry* entry = item->disk_cache_entry();
+          const int32 body_size =
+              entry->GetDataSize(item->disk_cache_stream_index());
+
+          scoped_refptr<net::IOBuffer> io_buffer = new net::IOBuffer(body_size);
+          net::TestCompletionCallback callback;
+          int rv =
+              entry->ReadData(item->disk_cache_stream_index(), 0,
+                              io_buffer.get(), body_size, callback.callback());
+          if (rv == net::ERR_IO_PENDING)
+            rv = callback.WaitForResult();
+          EXPECT_EQ(body_size, rv);
+          if (rv > 0)
+            output->append(io_buffer->data(), rv);
+        } break;
+        default: { ADD_FAILURE() << "invalid response blob type"; } break;
+      }
     }
   }