[Storage] Blob Storage Refactoring pt 1

content/browser/fileapi/fileapi_message_filter_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/fileapi/fileapi_message_filter.h"
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/shared_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process_handle.h"
 #include "content/browser/child_process_security_policy_impl.h"
 #include "content/browser/fileapi/chrome_blob_storage_context.h"
 #include "content/browser/streams/stream_registry.h"
 #include "content/common/fileapi/file_system_messages.h"
 #include "content/common/fileapi/webblob_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_file_system_context.h"
 #include "net/base/io_buffer.h"
 #include "storage/browser/blob/blob_storage_context.h"
 #include "storage/browser/fileapi/file_system_context.h"
-#include "storage/common/blob/blob_data.h"
+#include "storage/common/data_element.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 namespace {
 
 const char kFakeBlobInternalUrlSpec[] =
     "blob:blobinternal%3A///dc83ede4-9bbd-453b-be2e-60fd623fcc93";
 const char kFakeBlobInternalUrlSpec2[] =
     "blob:blobinternal%3A///d28ae2e7-d233-4dda-9598-d135fe5d403e";
@@ skipping 151 matching lines @@
 TEST_F(FileAPIMessageFilterTest, BuildNonEmptyStream) {
   StreamRegistry* stream_registry = stream_context_->registry();
 
   const GURL kUrl(kFakeBlobInternalUrlSpec);
 
   EXPECT_EQ(NULL, stream_registry->GetStream(kUrl).get());
 
   StreamHostMsg_StartBuilding start_message(kUrl, kFakeContentType);
   EXPECT_TRUE(filter_->OnMessageReceived(start_message));
 
-  storage::BlobData::Item item;
+  storage::DataElement item;
   const std::string kFakeData = "foobarbaz";
   item.SetToBytes(kFakeData.data(), kFakeData.size());
   StreamHostMsg_AppendBlobDataItem append_message(kUrl, item);
   EXPECT_TRUE(filter_->OnMessageReceived(append_message));
 
   StreamHostMsg_FinishBuilding finish_message(kUrl);
   EXPECT_TRUE(filter_->OnMessageReceived(finish_message));
 
   // Run loop to finish transfer and commit finalize command.
   message_loop_.RunUntilIdle();
@@ skipping 86 matching lines @@
   EXPECT_TRUE(filter_->OnMessageReceived(start_message));
 
   StreamHostMsg_Clone clone_message(kDestUrl, kUrl);
   EXPECT_TRUE(filter_->OnMessageReceived(clone_message));
 
   ASSERT_FALSE(stream_registry->GetStream(kUrl).get() == NULL);
   ASSERT_FALSE(stream_registry->GetStream(kDestUrl).get() == NULL);
 }
 
 }  // namespace content