Index: webkit/fileapi/webfilewriter_base_unittest.cc |
=================================================================== |
--- webkit/fileapi/webfilewriter_base_unittest.cc (revision 186525) |
+++ webkit/fileapi/webfilewriter_base_unittest.cc (working copy) |
@@ -51,7 +51,7 @@ |
received_write_ = false; |
received_write_path_ = GURL(); |
received_write_offset_ = kNoOffset; |
- received_write_blob_url_ = GURL(); |
+ received_write_blob_uuid_ = std::string(); |
received_cancel_ = false; |
} |
@@ -60,7 +60,7 @@ |
int64 received_truncate_offset_; |
bool received_write_; |
GURL received_write_path_; |
- GURL received_write_blob_url_; |
+ std::string received_write_blob_uuid_; |
int64 received_write_offset_; |
bool received_cancel_; |
@@ -87,12 +87,12 @@ |
} |
} |
- virtual void DoWrite(const GURL& path, const GURL& blob_url, |
+ virtual void DoWrite(const GURL& path, const std::string& blob_uuid, |
int64 offset) OVERRIDE { |
received_write_ = true; |
received_write_path_ = path; |
received_write_offset_ = offset; |
- received_write_blob_url_ = blob_url; |
+ received_write_blob_uuid_ = blob_uuid; |
if (offset == kBasicFileWrite_Offset) { |
DidWrite(1, true); |
@@ -192,8 +192,9 @@ |
TEST_F(FileWriterTest, BasicFileWrite) { |
// Call the webkit facing api. |
- const GURL kBlobUrl("blob://bloburl/"); |
- writer()->write(kBasicFileWrite_Offset, kBlobUrl); |
+ const std::string kBlobUUID("abc-123"); |
+ writer()->write(kBasicFileWrite_Offset, |
+ WebKit::WebString::fromUTF8(kBlobUUID.data())); |
// Check that the derived class gets called correctly. |
EXPECT_TRUE(testable_writer_->received_write_); |
@@ -201,7 +202,7 @@ |
mock_path_as_gurl()); |
EXPECT_EQ(kBasicFileWrite_Offset, |
testable_writer_->received_write_offset_); |
- EXPECT_EQ(kBlobUrl, testable_writer_->received_write_blob_url_); |
+ EXPECT_EQ(kBlobUUID, testable_writer_->received_write_blob_uuid_); |
EXPECT_FALSE(testable_writer_->received_truncate_); |
EXPECT_FALSE(testable_writer_->received_cancel_); |
@@ -234,8 +235,9 @@ |
TEST_F(FileWriterTest, ErrorFileWrite) { |
// Call the webkit facing api. |
- const GURL kBlobUrl("blob://bloburl/"); |
- writer()->write(kErrorFileWrite_Offset, kBlobUrl); |
+ const std::string kBlobUUID("abc-123"); |
+ writer()->write(kErrorFileWrite_Offset, |
+ WebKit::WebString::fromUTF8(kBlobUUID.data())); |
// Check that the derived class gets called correctly. |
EXPECT_TRUE(testable_writer_->received_write_); |
@@ -243,7 +245,7 @@ |
mock_path_as_gurl()); |
EXPECT_EQ(kErrorFileWrite_Offset, |
testable_writer_->received_write_offset_); |
- EXPECT_EQ(kBlobUrl, testable_writer_->received_write_blob_url_); |
+ EXPECT_EQ(kBlobUUID, testable_writer_->received_write_blob_uuid_); |
EXPECT_FALSE(testable_writer_->received_truncate_); |
EXPECT_FALSE(testable_writer_->received_cancel_); |
@@ -276,8 +278,9 @@ |
TEST_F(FileWriterTest, MultiFileWrite) { |
// Call the webkit facing api. |
- const GURL kBlobUrl("blob://bloburl/"); |
- writer()->write(kMultiFileWrite_Offset, kBlobUrl); |
+ const std::string kBlobUUID("abc-123"); |
+ writer()->write(kMultiFileWrite_Offset, |
+ WebKit::WebString::fromUTF8(kBlobUUID.data())); |
// Check that the derived class gets called correctly. |
EXPECT_TRUE(testable_writer_->received_write_); |
@@ -285,7 +288,7 @@ |
mock_path_as_gurl()); |
EXPECT_EQ(kMultiFileWrite_Offset, |
testable_writer_->received_write_offset_); |
- EXPECT_EQ(kBlobUrl, testable_writer_->received_write_blob_url_); |
+ EXPECT_EQ(kBlobUUID, testable_writer_->received_write_blob_uuid_); |
EXPECT_FALSE(testable_writer_->received_truncate_); |
EXPECT_FALSE(testable_writer_->received_cancel_); |
@@ -299,8 +302,9 @@ |
TEST_F(FileWriterTest, CancelFileWriteBeforeCompletion) { |
// Call the webkit facing api. |
- const GURL kBlobUrl("blob://bloburl/"); |
- writer()->write(kCancelFileWriteBeforeCompletion_Offset, kBlobUrl); |
+ const std::string kBlobUUID("abc-123"); |
+ writer()->write(kCancelFileWriteBeforeCompletion_Offset, |
+ WebKit::WebString::fromUTF8(kBlobUUID.data())); |
// Check that the derived class gets called correctly. |
EXPECT_TRUE(testable_writer_->received_write_); |
@@ -308,7 +312,7 @@ |
mock_path_as_gurl()); |
EXPECT_EQ(kCancelFileWriteBeforeCompletion_Offset, |
testable_writer_->received_write_offset_); |
- EXPECT_EQ(kBlobUrl, testable_writer_->received_write_blob_url_); |
+ EXPECT_EQ(kBlobUUID, testable_writer_->received_write_blob_uuid_); |
EXPECT_TRUE(testable_writer_->received_cancel_); |
EXPECT_FALSE(testable_writer_->received_truncate_); |
@@ -323,8 +327,9 @@ |
TEST_F(FileWriterTest, CancelFileWriteAfterCompletion) { |
// Call the webkit facing api. |
- const GURL kBlobUrl("blob://bloburl/"); |
- writer()->write(kCancelFileWriteAfterCompletion_Offset, kBlobUrl); |
+ const std::string kBlobUUID("abc-123"); |
+ writer()->write(kCancelFileWriteAfterCompletion_Offset, |
+ WebKit::WebString::fromUTF8(kBlobUUID.data())); |
// Check that the derived class gets called correctly. |
EXPECT_TRUE(testable_writer_->received_write_); |
@@ -332,7 +337,7 @@ |
mock_path_as_gurl()); |
EXPECT_EQ(kCancelFileWriteAfterCompletion_Offset, |
testable_writer_->received_write_offset_); |
- EXPECT_EQ(kBlobUrl, testable_writer_->received_write_blob_url_); |
+ EXPECT_EQ(kBlobUUID, testable_writer_->received_write_blob_uuid_); |
EXPECT_TRUE(testable_writer_->received_cancel_); |
EXPECT_FALSE(testable_writer_->received_truncate_); |
@@ -386,8 +391,10 @@ |
} |
TEST_F(FileWriterTest, DeleteInCompletionCallbacks) { |
+ const std::string kBlobUUID("abc-123"); |
delete_in_client_callback_ = true; |
- writer()->write(kBasicFileWrite_Offset, GURL("blob://bloburl/")); |
+ writer()->write(kBasicFileWrite_Offset, |
+ WebKit::WebString::fromUTF8(kBlobUUID.data())); |
EXPECT_FALSE(testable_writer_.get()); |
reset(); |
@@ -397,7 +404,8 @@ |
reset(); |
delete_in_client_callback_ = true; |
- writer()->write(kErrorFileWrite_Offset, GURL("blob://bloburl/")); |
+ writer()->write(kErrorFileWrite_Offset, |
+ WebKit::WebString::fromUTF8(kBlobUUID.data())); |
EXPECT_FALSE(testable_writer_.get()); |
reset(); |