Merge 199450 "Fix imageburner trying to extract downloaded image..."

chrome/browser/chromeos/imageburner/burn_manager.cc

Index: chrome/browser/chromeos/imageburner/burn_manager.cc
===================================================================
--- chrome/browser/chromeos/imageburner/burn_manager.cc	(revision 200070)
+++ chrome/browser/chromeos/imageburner/burn_manager.cc	(working copy)
@@ -214,6 +214,7 @@
     const base::FilePath& downloads_directory,
     scoped_refptr<net::URLRequestContextGetter> context_getter)
     : device_handler_(disks::DiskMountManager::GetInstance()),
+      image_dir_created_(false),
       unzipping_(false),
       cancelled_(false),
       burning_(false),
@@ -238,7 +239,7 @@
 }
 
 BurnManager::~BurnManager() {
-  if (!image_dir_.empty()) {
+  if (image_dir_created_) {
     file_util::Delete(image_dir_, true);
   }
   NetworkStateHandler::Get()->RemoveObserver(this);
@@ -319,7 +320,7 @@
 }
 
 void BurnManager::CreateImageDir() {
-  if (image_dir_.empty()) {
+  if (!image_dir_created_) {
     BrowserThread::PostBlockingPoolTask(
         FROM_HERE,
         base::Bind(CreateDirectory,
@@ -340,11 +341,14 @@
     return;
   }
 
+  image_dir_created_ = true;
   zip_image_file_path_ = image_dir_.Append(kImageZipFileName);
   FetchConfigFile();
 }
 
-const base::FilePath& BurnManager::GetImageDir() {
+base::FilePath BurnManager::GetImageDir() {
+  if (!image_dir_created_)
+    return base::FilePath();
   return image_dir_;
 }