Adds USB writing for OS X.

chrome/utility/image_writer/image_writer.cc

 // Copyright 2014 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 "chrome/utility/image_writer/image_writer.h"
+
 #include "base/memory/aligned_memory.h"
 #include "chrome/utility/image_writer/error_messages.h"
-#include "chrome/utility/image_writer/image_writer.h"
 #include "chrome/utility/image_writer/image_writer_handler.h"
 #include "content/public/utility/utility_thread.h"
 
+#if defined(OS_MACOSX)
+#include "chrome/utility/image_writer/disk_unmounter_mac.h"
+#endif
+
 namespace image_writer {
 
 // Since block devices like large sequential access and IPC is expensive we're
 // doing work in 1MB chunks.
 const int kBurningBlockSize = 1 << 20;  // 1 MB
 const int kMemoryAlignment = 4096;
 
 ImageWriter::ImageWriter(ImageWriterHandler* handler,
                          const base::FilePath& image_path,
                          const base::FilePath& device_path)
@@ skipping 62 matching lines @@
                                base::File::FLAG_EXCLUSIVE_READ);
 
     if (!image_file_.IsValid()) {
       DLOG(ERROR) << "Unable to open file for read: " << image_path_.value();
       Error(error::kOpenImage);
       return false;
     }
   }
 
   if (!device_file_.IsValid()) {
-#if defined(OS_WIN)
-    // Windows requires that device files be opened with FILE_FLAG_NO_BUFFERING
-    // and FILE_FLAG_WRITE_THROUGH.  These two flags are not part of base::File.
-    device_file_ =
-        base::File(CreateFile(device_path_.value().c_str(),
-                              GENERIC_READ | GENERIC_WRITE,
-                              FILE_SHARE_READ | FILE_SHARE_WRITE,
-                              NULL,
-                              OPEN_EXISTING,
-                              FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH,
-                              NULL));
-#else
-    device_file_.Initialize(
-        device_path_,
-        base::File::FLAG_OPEN | base::File::FLAG_READ | base::File::FLAG_WRITE |
-            base::File::FLAG_EXCLUSIVE_READ | base::File::FLAG_EXCLUSIVE_WRITE);
-#endif
-    if (!device_file_.IsValid()) {
+    if (!OpenDevice()) {
       Error(error::kOpenDevice);
       return false;
     }
   }
 
   bytes_processed_ = 0;
   running_ = true;
 
   return true;
 }
@@ skipping 79 matching lines @@
     running_ = false;
   } else {
     // Unable to read entire file.
     LOG(ERROR) << "Failed to read " << kBurningBlockSize << " bytes of image "
                << "at offset " << bytes_processed_;
     Error(error::kReadImage);
   }
 }
 
 }  // namespace image_writer