| Index: chrome/browser/extensions/api/image_writer_private/test_utils.cc
|
| diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
|
| index 29c5b5cc3e467aabb2f6152bcc89ca7ef7ad2e80..999898bd9029da0a3c01d01735977336fe93bf97 100644
|
| --- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc
|
| +++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
|
| @@ -45,18 +45,16 @@
|
| private:
|
| BurnFinishedHandler burn_finished_handler_;
|
| BurnProgressUpdateHandler burn_progress_update_handler_;
|
| +
|
| };
|
|
|
| } // namespace
|
| #endif
|
|
|
| MockOperationManager::MockOperationManager() : OperationManager(NULL) {}
|
| -MockOperationManager::MockOperationManager(Profile* profile)
|
| - : OperationManager(profile) {}
|
| MockOperationManager::~MockOperationManager() {}
|
|
|
| -ImageWriterUnitTestBase::ImageWriterUnitTestBase()
|
| - : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
|
| +ImageWriterUnitTestBase::ImageWriterUnitTestBase() {}
|
| ImageWriterUnitTestBase::~ImageWriterUnitTestBase() {}
|
|
|
| void ImageWriterUnitTestBase::SetUp() {
|
| @@ -89,6 +87,31 @@
|
| #endif
|
| }
|
|
|
| +bool ImageWriterUnitTestBase::CompareImageAndDevice() {
|
| + scoped_ptr<char[]> image_buffer(new char[kTestFileSize]);
|
| + scoped_ptr<char[]> device_buffer(new char[kTestFileSize]);
|
| +
|
| + while (true) {
|
| + int image_bytes_read = ReadFile(test_image_path_,
|
| + image_buffer.get(),
|
| + kTestFileSize);
|
| + int device_bytes_read = ReadFile(test_device_path_,
|
| + device_buffer.get(),
|
| + kTestFileSize);
|
| +
|
| + if (image_bytes_read != device_bytes_read)
|
| + return false;
|
| +
|
| + if (image_bytes_read == 0)
|
| + return true;
|
| +
|
| + if (memcmp(image_buffer.get(), device_buffer.get(), image_bytes_read) != 0)
|
| + return false;
|
| + }
|
| +
|
| + return false;
|
| +}
|
| +
|
| bool ImageWriterUnitTestBase::FillFile(const base::FilePath& file,
|
| const int pattern,
|
| const int length) {
|
|
|