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

chrome/browser/chromeos/imageburner/burn_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_IMAGEBURNER_BURN_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_IMAGEBURNER_BURN_MANAGER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 305 matching lines @@
                                           int64 current,
                                           int64 total) OVERRIDE;
 
   // NetworkStateHandlerObserver override.
   virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;
 
   // Creates directory image will be downloaded to.
   // Must be called from FILE thread.
   void CreateImageDir();
 
-  // Returns directory image should be dopwnloaded to.
-  // The directory has to be previously created.
-  const base::FilePath& GetImageDir();
+  // Returns the directory to which the recovery image should be downloaded.
+  // If the directory hasn't been previously created, an empty path is returned
+  // (in which case |CreateImageDir()| should be called).
+  base::FilePath GetImageDir();
 
   const base::FilePath& target_device_path() { return target_device_path_; }
   void set_target_device_path(const base::FilePath& path) {
     target_device_path_ = path;
   }
 
   const base::FilePath& target_file_path() { return target_file_path_; }
   void set_target_file_path(const base::FilePath& path) {
     target_file_path_ = path;
   }
@@ skipping 23 matching lines @@
                       const std::string& error);
   void OnBurnProgressUpdate(const std::string& target_path,
                             int64 num_bytes_burnt,
                             int64 total_size);
 
   void NotifyDeviceAdded(const disks::DiskMountManager::Disk& disk);
   void NotifyDeviceRemoved(const disks::DiskMountManager::Disk& disk);
 
   BurnDeviceHandler device_handler_;
 
+  bool image_dir_created_;
   bool unzipping_;
   bool cancelled_;
   bool burning_;
   bool block_burn_signals_;
 
   base::FilePath image_dir_;
   base::FilePath zip_image_file_path_;
   base::FilePath source_image_path_;
   base::FilePath target_device_path_;
   base::FilePath target_file_path_;
@@ skipping 20 matching lines @@
   base::WeakPtrFactory<BurnManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BurnManager);
 };
 
 }  // namespace imageburner
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_IMAGEBURNER_BURN_MANAGER_H_