Fix imageburner trying to extract downloaded image to unexisting folder.

chrome/browser/chromeos/imageburner/burn_manager.cc

 // Copyright (c) 2012 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/browser/chromeos/imageburner/burn_manager.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/threading/worker_pool.h"
@@ skipping 196 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 //
 // BurnManager
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 BurnManager::BurnManager(
     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),
       block_burn_signals_(false),
       image_dir_(downloads_directory.Append(kTempImageFolderName)),
       config_file_url_(kConfigFileUrl),
       config_file_fetched_(false),
       state_machine_(new StateMachine()),
       url_request_context_getter_(context_getter),
       bytes_image_download_progress_last_reported_(0),
       weak_ptr_factory_(this) {
   NetworkStateHandler::Get()->AddObserver(this);
   base::WeakPtr<BurnManager> weak_ptr(weak_ptr_factory_.GetWeakPtr());
   device_handler_.SetCallbacks(
       base::Bind(&BurnManager::NotifyDeviceAdded, weak_ptr),
       base::Bind(&BurnManager::NotifyDeviceRemoved, weak_ptr));
   DBusThreadManager::Get()->GetImageBurnerClient()->SetEventHandlers(
       base::Bind(&BurnManager::OnBurnFinished,
                  weak_ptr_factory_.GetWeakPtr()),
       base::Bind(&BurnManager::OnBurnProgressUpdate,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 BurnManager::~BurnManager() {
-  if (!image_dir_.empty()) {
+  if (image_dir_created_) {
     file_util::Delete(image_dir_, true);
   }
   NetworkStateHandler::Get()->RemoveObserver(this);
   DBusThreadManager::Get()->GetImageBurnerClient()->ResetEventHandlers();
 }
 
 // static
 void BurnManager::Initialize(
     const base::FilePath& downloads_directory,
     scoped_refptr<net::URLRequestContextGetter> context_getter) {
@@ skipping 60 matching lines @@
     CancelImageFetch();
   } else if (state == StateMachine::BURNING) {
     // Burn library doesn't send cancelled signal upon CancelBurnImage
     // invokation.
     CancelBurnImage();
   }
   ResetTargetPaths();
 }
 
 void BurnManager::CreateImageDir() {
-  if (image_dir_.empty()) {
+  if (!image_dir_created_) {
     BrowserThread::PostBlockingPoolTask(
         FROM_HERE,
         base::Bind(CreateDirectory,
                    image_dir_,
                    base::Bind(&BurnManager::OnImageDirCreated,
                               weak_ptr_factory_.GetWeakPtr())));
   } else {
     const bool success = true;
     OnImageDirCreated(success);
   }
 }
 
 void BurnManager::OnImageDirCreated(bool success) {
   if (!success) {
     // Failed to create the directory. Finish the burning process
     // with failure state.
     OnError(IDS_IMAGEBURN_DOWNLOAD_ERROR);
     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_;
 }
 
 void BurnManager::FetchConfigFile() {
   if (config_file_fetched_) {
     // The config file is already fetched. So start to fetch the image.
     FetchImage();
     return;
   }
 
@@ skipping 283 matching lines @@
     // Note: in theory, this is not a part of notification, but cancelling
     // the running burning task. However, there is no good place to be in the
     // current code.
     // TODO(hidehiko): Clean this up after refactoring.
     OnError(IDS_IMAGEBURN_DEVICE_NOT_FOUND_ERROR);
   }
 }
 
 }  // namespace imageburner
 }  // namespace chromeos