Remove chromeos::LibraryLoader

chrome/browser/chromeos/cros/cros_library.cc

Index: chrome/browser/chromeos/cros/cros_library.cc
diff --git a/chrome/browser/chromeos/cros/cros_library.cc b/chrome/browser/chromeos/cros/cros_library.cc
index 41f63535cf700035bb311bc0cc37cbd7ec73ba5d..80dee394023f968f7dd0a2ab27ee9c4e4e0ec6d6 100644
--- a/chrome/browser/chromeos/cros/cros_library.cc
+++ b/chrome/browser/chromeos/cros/cros_library.cc
@@ -7,16 +7,11 @@
 #include "chrome/browser/chromeos/cros/burn_library.h"
 #include "chrome/browser/chromeos/cros/cert_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/chromeos/cros/library_loader.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "third_party/cros/chromeos_cros_api.h"
 
-// Pass !libcros_loaded_ to GetDefaultImpl instead of use_stub_impl_ so that
-// we load the stub impl regardless of whether use_stub was specified or the
-// library failed to load.
 #define DEFINE_GET_LIBRARY_METHOD(class_prefix, var_prefix)                    \
 class_prefix##Library* CrosLibrary::Get##class_prefix##Library() {             \
-  return var_prefix##_lib_.GetDefaultImpl(!libcros_loaded_);                   \
+  return var_prefix##_lib_.GetDefaultImpl(use_stub_impl_);                     \
 }
 
 #define DEFINE_SET_LIBRARY_METHOD(class_prefix, var_prefix)                    \
@@ -30,35 +25,18 @@ namespace chromeos {
 static CrosLibrary* g_cros_library = NULL;
 
 CrosLibrary::CrosLibrary(bool use_stub)
-    : library_loader_(NULL),
-      own_library_loader_(false),
-      use_stub_impl_(use_stub),
-      libcros_loaded_(false),
-      load_error_(false),
+    : use_stub_impl_(use_stub),
       test_api_(NULL) {
 }
 
 CrosLibrary::~CrosLibrary() {
-  if (own_library_loader_)
-    delete library_loader_;
 }
 
 // static
 void CrosLibrary::Initialize(bool use_stub) {
   CHECK(!g_cros_library) << "CrosLibrary: Multiple calls to Initialize().";
   g_cros_library = new CrosLibrary(use_stub);
-  if (use_stub) {
-    VLOG(1) << "CrosLibrary Initialized with Stub Impl.";
-    return;
-  }
-  // Attempt to load libcros here, so that we can log, show warnings, and
-  // set load_error_string_ immediately.
-  if (g_cros_library->LoadLibcros()) {
-    VLOG(1) << "CrosLibrary Initialized, version = " << kCrosAPIVersion;
-  } else {
-    LOG(WARNING) << "CrosLibrary failed to Initialize."
-                 << " Will use stub implementations.";
-  }
+  VLOG_IF(1, use_stub) << "CrosLibrary Initialized with Stub Impl.";
 }
 
 // static
@@ -80,43 +58,12 @@ DEFINE_GET_LIBRARY_METHOD(Cert, cert);
 DEFINE_GET_LIBRARY_METHOD(Cryptohome, crypto);
 DEFINE_GET_LIBRARY_METHOD(Network, network);
 
-bool CrosLibrary::LoadLibcros() {
-  if (!libcros_loaded_ && !load_error_) {
-    if (!library_loader_) {
-      library_loader_ = LibraryLoader::GetImpl();
-      own_library_loader_ = true;
-    }
-    libcros_loaded_ = library_loader_->Load(&load_error_string_);
-    load_error_ = !libcros_loaded_;
-  }
-  return libcros_loaded_;
-}
-
 CrosLibrary::TestApi* CrosLibrary::GetTestApi() {
   if (!test_api_.get())
     test_api_.reset(new TestApi(this));
   return test_api_.get();
 }
 
-void CrosLibrary::TestApi::ResetUseStubImpl() {
-  library_->use_stub_impl_ = false;
-  if (!library_->LoadLibcros())
-    LOG(WARNING) << "ResetUseStubImpl: Unable to load libcros.";
-}
-
-void CrosLibrary::TestApi::SetLibraryLoader(LibraryLoader* loader, bool own) {
-  if (library_->library_loader_ == loader)
-    return;
-  if (library_->own_library_loader_)
-    delete library_->library_loader_;
-  library_->own_library_loader_ = own;
-  library_->library_loader_ = loader;
-  // Reset load flags when loader changes. Otherwise some tests are really not
-  // going to be happy.
-  library_->libcros_loaded_ = false;
-  library_->load_error_ = false;
-}
-
 DEFINE_SET_LIBRARY_METHOD(Cert, cert);
 DEFINE_SET_LIBRARY_METHOD(Burn, burn);
 DEFINE_SET_LIBRARY_METHOD(Cryptohome, crypto);