Remove chromeos::CryptohomeLibrary::IsMounted and convert

chrome/browser/profiles/profile_manager.cc

Index: chrome/browser/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index af82b91d099118b7ebee489a30357e7d602f0dc8..f0ac7b28122a2ec08b5389eafb34fd301f6f3f95 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -58,8 +58,8 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/cryptohome_library.h"
+#include "chromeos/dbus/cryptohome_client.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #endif
 
@@ -163,6 +163,13 @@ void OnOpenWindowForNewProfile(Profile* profile,
   }
 }
 
+#if defined(OS_CHROMEOS)
+void CheckCryptohomeIsMounted(chromeos::DBusMethodCallStatus call_status,
+                              bool is_mounted) {
+  CHECK(call_status == chromeos::DBUS_METHOD_CALL_SUCCESS && is_mounted);

[stevenjb, 2012/07/23 17:42:50]

This shouldn't be a CHECK - it *could* fail. We should LOG(ERROR) instead,
possibly LOG(FATAL) if other behavior/assumptions would break badly (might need
to check with folks working on cryptohome in that case). We should also
differentiate between the DBus call failing and is_mounted being false (at least
for the error message).

[hashimoto, 2012/07/24 01:02:58]

Done.
"CHECK(!GetProfileByPath(default_profile_dir))" below the IsMounted() call
should be also replaced with LOG(ERROR)?

[stevenjb, 2012/07/24 16:46:36]

I don't think that getting the profile relies on external services? Even if it
does, I expect that it would be unrecoverable, so CHECK seems fine there. DBus
calls on the other hand could fail for a host of reasons and may be recoverable
(e.g. with a re-try), so we should only CHECK on their success if we would crash
later anyway. 

+}
+#endif
+
 } // namespace
 
 #if defined(ENABLE_SESSION_SERVICE)
@@ -526,8 +533,8 @@ void ProfileManager::Observe(
       // TODO(davemoore) Once we have better api this check should ensure that
       // our profile directory is the one that's mounted, and that it's mounted
       // as the current user.
-      CHECK(chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->IsMounted())
-          << "The cryptohome was not mounted at login.";
+      chromeos::DBusThreadManager::Get()->GetCryptohomeClient()->IsMounted(
+          base::Bind(&CheckCryptohomeIsMounted));
 
       // Confirm that we hadn't loaded the new profile previously.
       FilePath default_profile_dir =