Use stub impl when libcros fails to load

chrome/browser/chromeos/cros/burn_library.cc

 // Copyright (c) 2011 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/cros/burn_library.h"
 
 #include <cstring>
 #include "base/memory/linked_ptr.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/common/zip.h"
@@ skipping 70 matching lines @@
 
   friend class base::RefCountedThreadSafe<BurnLibraryTaskProxy>;
 
   DISALLOW_COPY_AND_ASSIGN(BurnLibraryTaskProxy);
 };
 
 BurnLibraryImpl::BurnLibraryImpl() : unzipping_(false),
                                      cancelled_(false),
                                      burning_(false),
                                      block_burn_signals_(false) {
-  if (CrosLibrary::Get()->EnsureLoaded()) {
-    Init();
-  } else {
-    LOG(ERROR) << "Cros Library has not been loaded";
-  }
 }
 
 BurnLibraryImpl::~BurnLibraryImpl() {
   if (burn_status_connection_) {
     DisconnectBurnStatus(burn_status_connection_);
   }
 }
 
 void BurnLibraryImpl::Init() {
-  burn_status_connection_ = MonitorBurnStatus(&BurnStatusChangedHandler, this);
+  DCHECK(CrosLibrary::Get()->libcros_loaded());
+  burn_status_connection_ =
+      chromeos::MonitorBurnStatus(&BurnStatusChangedHandler, this);
 }
 
 void BurnLibraryImpl::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
   if (unzipping_ && !cancelled_)
     UpdateBurnStatus(ImageBurnStatus(), UNZIP_STARTED);
 }
 
 void BurnLibraryImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
@@ skipping 131 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_,
       BurnProgressUpdated(this, evt, status));
 }
 
 class BurnLibraryStubImpl : public BurnLibrary {
  public:
   BurnLibraryStubImpl() {}
   virtual ~BurnLibraryStubImpl() {}
 
   // BurnLibrary overrides.
+  virtual void Init() OVERRIDE {}
   virtual void AddObserver(Observer* observer) OVERRIDE {}
   virtual void RemoveObserver(Observer* observer) OVERRIDE {}
   virtual void DoBurn(const FilePath& source_path,
                       const std::string& image_name,
                       const FilePath& target_file_path,
                       const FilePath& target_device_path) OVERRIDE {
   }
   virtual void CancelBurnImage() OVERRIDE {}
 
   DISALLOW_COPY_AND_ASSIGN(BurnLibraryStubImpl);
 };
 
 // static
 BurnLibrary* BurnLibrary::GetImpl(bool stub) {
+  BurnLibrary* impl;
   if (stub)
-    return new BurnLibraryStubImpl();
+    impl = new BurnLibraryStubImpl();
   else
-    return new BurnLibraryImpl();
+    impl = new BurnLibraryImpl();
+  impl->Init();
+  return impl;
 }
 
 }  // namespace chromeos
 
 // Allows InvokeLater without adding refcounting. This class is a Singleton and
 // won't be deleted until it's last InvokeLater is run.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::BurnLibraryImpl);
-