Use stub impl when libcros fails to load

chrome/browser/chromeos/cros/cros_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/cros_library.h"
 
 #include "chrome/browser/chromeos/cros/brightness_library.h"
 #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/libcros_service_library.h"
 #include "chrome/browser/chromeos/cros/library_loader.h"
 #include "chrome/browser/chromeos/cros/login_library.h"
 #include "chrome/browser/chromeos/cros/mount_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/cros/screen_lock_library.h"
 #include "chrome/browser/chromeos/cros/speech_synthesis_library.h"
 #include "chrome/browser/chromeos/cros/update_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(use_stub_impl_);                     \
+  return var_prefix##_lib_.GetDefaultImpl(!libcros_loaded_);                   \
 }
 
 #define DEFINE_SET_LIBRARY_METHOD(class_prefix, var_prefix)                    \
 void CrosLibrary::TestApi::Set##class_prefix##Library(                         \
     class_prefix##Library* library, bool own) {                                \
   library_->var_prefix##_lib_.SetImpl(library, own);                           \
 }
 
 namespace chromeos {
 
@@ skipping 16 matching lines @@
 // 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())
+  if (g_cros_library->LoadLibcros()) {
     VLOG(1) << "CrosLibrary Initialized, version = " << kCrosAPIVersion;
-  else
-    LOG(WARNING) << "CrosLibrary failed to Initialize.";
+  } else {
+    LOG(WARNING) << "CrosLibrary failed to Initialize."
+                 << " Will use stub implementations.";

[satorux1, 2011/09/16 20:05:55]

This is okay for Linux desktop, but I think this should be a fatal error on the
chromebook. Can we do something like

if (g_cros_library->LoadLibcros(&error)) {
 VLOG(1) << "CrosLibrary Initialized, version = " << kCrosAPIVersion;
} else if (error == LIBCROS_NOT_FOUND) {
   // This is likely on Linux desktop so go ahead with a warning
} else {
  LOG(FATAL) << ...
}

[stevenjb, 2011/09/16 21:44:24]

I actually prefer to use a warning here. We already block login on ChromeOS, and
the network menu UI already shows a warning icon when running with a stub impl.

On 2011/09/16 20:05:55, satorux1 wrote:

[satorux1, 2011/09/16 21:59:43]

I misunderstood. I thought you changed this from a fatal error to a warning, but
the original code was also using LOG(WARNING).

I thought we had a mechanism to show libcros mismatch on the login screen. Where
is the code, should we modify the code?

+  }
 }
 
 // static
 void CrosLibrary::Shutdown() {
   CHECK(g_cros_library) << "CrosLibrary::Shutdown() called with NULL library";
   VLOG(1) << "CrosLibrary Shutting down...";
   delete g_cros_library;
   g_cros_library = NULL;
   VLOG(1) << "  CrosLibrary Shutdown completed.";
 }
@@ skipping 60 matching lines @@
 DEFINE_SET_LIBRARY_METHOD(LibCrosService, libcros_service);
 DEFINE_SET_LIBRARY_METHOD(Login, login);
 DEFINE_SET_LIBRARY_METHOD(Mount, mount);
 DEFINE_SET_LIBRARY_METHOD(Network, network);
 DEFINE_SET_LIBRARY_METHOD(Power, power);
 DEFINE_SET_LIBRARY_METHOD(ScreenLock, screen_lock);
 DEFINE_SET_LIBRARY_METHOD(SpeechSynthesis, speech_synthesis);
 DEFINE_SET_LIBRARY_METHOD(Update, update);
 
 } // namespace chromeos