Remove chromeos::CryptohomeLibrary::IsMounted and convert

chrome/browser/profiles/profile_manager.cc

 // 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.
 
 #include <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "chrome/installer/util/browser_distribution.h"
 #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
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 namespace {
 
 // Profiles that should be deleted on shutdown.
 std::vector<FilePath>& ProfilesToDelete() {
@@ skipping 83 matching lines @@
                                Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_INITIALIZED) {
     ProfileManager::FindOrCreateNewWindowForProfile(
         profile,
         chrome::startup::IS_PROCESS_STARTUP,
         chrome::startup::IS_FIRST_RUN,
         false);
   }
 }
 
+#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)
 // static
 void ProfileManager::ShutdownSessionServices() {
   ProfileManager* pm = g_browser_process->profile_manager();
   if (!pm)  // Is NULL when running unit tests.
     return;
   std::vector<Profile*> profiles(pm->GetLoadedProfiles());
   for (size_t i = 0; i < profiles.size(); ++i)
@@ skipping 343 matching lines @@
 #if defined(OS_CHROMEOS)
   if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
     logged_in_ = true;
 
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
     if (!command_line.HasSwitch(switches::kTestType)) {
       // If we don't have a mounted profile directory we're in trouble.
       // 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 =
           user_data_dir_.Append(GetInitialProfileDir());
       CHECK(!GetProfileByPath(default_profile_dir))
           << "The default profile was loaded before we mounted the cryptohome.";
     }
     return;
   }
 #endif
@@ skipping 471 matching lines @@
 void ProfileManager::RunCallbacks(const std::vector<CreateCallback>& callbacks,
                                   Profile* profile,
                                   Profile::CreateStatus status) {
   for (size_t i = 0; i < callbacks.size(); ++i)
     callbacks[i].Run(profile, status);
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }