diff options
Diffstat (limited to 'chrome')
8 files changed, 19 insertions, 34 deletions
diff --git a/chrome/browser/chromeos/cros/cryptohome_library.cc b/chrome/browser/chromeos/cros/cryptohome_library.cc index 176eaef..b67b55f 100644 --- a/chrome/browser/chromeos/cros/cryptohome_library.cc +++ b/chrome/browser/chromeos/cros/cryptohome_library.cc @@ -29,12 +29,6 @@ class CryptohomeLibraryImpl : public CryptohomeLibrary { virtual ~CryptohomeLibraryImpl() { } - virtual bool IsMounted() OVERRIDE { - bool result = false; - DBusThreadManager::Get()->GetCryptohomeClient()->IsMounted(&result); - return result; - } - virtual bool TpmIsEnabled() OVERRIDE { bool result = false; DBusThreadManager::Get()->GetCryptohomeClient()->CallTpmIsEnabledAndBlock( @@ -143,10 +137,6 @@ class CryptohomeLibraryStubImpl : public CryptohomeLibrary { : locked_(false) {} virtual ~CryptohomeLibraryStubImpl() {} - virtual bool IsMounted() OVERRIDE { - return true; - } - virtual bool TpmIsEnabled() OVERRIDE { return true; } diff --git a/chrome/browser/chromeos/cros/cryptohome_library.h b/chrome/browser/chromeos/cros/cryptohome_library.h index 35cfe52..f7e83a1 100644 --- a/chrome/browser/chromeos/cros/cryptohome_library.h +++ b/chrome/browser/chromeos/cros/cryptohome_library.h @@ -16,9 +16,6 @@ class CryptohomeLibrary { CryptohomeLibrary(); virtual ~CryptohomeLibrary(); - // Asks cryptohomed if a drive is currently mounted. - virtual bool IsMounted() = 0; - // Wrappers of the functions for working with Tpm. // Returns whether Tpm is presented and enabled. diff --git a/chrome/browser/chromeos/cros/mock_cryptohome_library.h b/chrome/browser/chromeos/cros/mock_cryptohome_library.h index 24a4e81..f24e508 100644 --- a/chrome/browser/chromeos/cros/mock_cryptohome_library.h +++ b/chrome/browser/chromeos/cros/mock_cryptohome_library.h @@ -21,7 +21,6 @@ class MockCryptohomeLibrary : public CryptohomeLibrary { public: MockCryptohomeLibrary(); virtual ~MockCryptohomeLibrary(); - MOCK_METHOD0(IsMounted, bool(void)); MOCK_METHOD0(GetSystemSalt, std::string(void)); MOCK_METHOD0(TpmIsReady, bool(void)); diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 5a82495..c2d8f70 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -8,7 +8,6 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" #include "chrome/browser/chromeos/cros/cros_mock.h" -#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" #include "chrome/browser/chromeos/cros/mock_network_library.h" #include "chrome/browser/chromeos/login/existing_user_controller.h" #include "chrome/browser/chromeos/login/helper.h" @@ -37,6 +36,7 @@ namespace chromeos { using ::testing::AnyNumber; using ::testing::AnyOf; +using ::testing::Invoke; using ::testing::InvokeWithoutArgs; using ::testing::Return; using ::testing::ReturnNull; @@ -97,8 +97,7 @@ class MockLoginDisplayHost : public LoginDisplayHost { class ExistingUserControllerTest : public CrosInProcessBrowserTest { protected: ExistingUserControllerTest() - : mock_cryptohome_library_(NULL), - mock_network_library_(NULL), + : mock_network_library_(NULL), mock_login_display_(NULL), mock_login_display_host_(NULL), testing_profile_(NULL) { @@ -126,12 +125,6 @@ class ExistingUserControllerTest : public CrosInProcessBrowserTest { EXPECT_CALL(*mock_session_manager_client, RetrieveDevicePolicy(_)) .Times(AnyNumber()); - cros_mock_->InitMockCryptohomeLibrary(); - mock_cryptohome_library_ = cros_mock_->mock_cryptohome_library(); - EXPECT_CALL(*mock_cryptohome_library_, IsMounted()) - .Times(AnyNumber()) - .WillRepeatedly(Return(true)); - mock_login_utils_ = new MockLoginUtils(); LoginUtils::Set(mock_login_utils_); EXPECT_CALL(*mock_login_utils_, PrewarmAuthentication()) @@ -208,7 +201,6 @@ class ExistingUserControllerTest : public CrosInProcessBrowserTest { scoped_ptr<ExistingUserController> existing_user_controller_; // These mocks are owned by CrosLibrary class. - MockCryptohomeLibrary* mock_cryptohome_library_; MockNetworkLibrary* mock_network_library_; MockLoginDisplay* mock_login_display_; diff --git a/chrome/browser/chromeos/login/login_browsertest.cc b/chrome/browser/chromeos/login/login_browsertest.cc index 212278d..1e130b5 100644 --- a/chrome/browser/chromeos/login/login_browsertest.cc +++ b/chrome/browser/chromeos/login/login_browsertest.cc @@ -35,8 +35,6 @@ class LoginTestBase : public CrosInProcessBrowserTest { cros_mock_->InitMockCryptohomeLibrary(); mock_cryptohome_library_ = cros_mock_->mock_cryptohome_library(); mock_network_library_ = cros_mock_->mock_network_library(); - EXPECT_CALL(*mock_cryptohome_library_, IsMounted()) - .WillRepeatedly(Return(true)); EXPECT_CALL(*mock_cryptohome_library_, GetSystemSalt()) .WillRepeatedly(Return(std::string("stub_system_salt"))); EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_)) diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc index fff1961..4546141 100644 --- a/chrome/browser/chromeos/login/login_utils_browsertest.cc +++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc @@ -167,8 +167,6 @@ class LoginUtilsTest : public testing::Test, .WillRepeatedly(Return(true)); EXPECT_CALL(*cryptohome_, TpmIsEnabled()) .WillRepeatedly(Return(false)); - EXPECT_CALL(*cryptohome_, IsMounted()) - .WillRepeatedly(Return(true)); EXPECT_CALL(*cryptohome_, InstallAttributesSet(kAttributeOwned, kTrue)) .WillRepeatedly(Return(true)); EXPECT_CALL(*cryptohome_, InstallAttributesSet(kAttributeOwner, diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 6cb1da9..f8a375b 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,18 @@ void OnOpenWindowForNewProfile(Profile* profile, } } +#if defined(OS_CHROMEOS) +void CheckCryptohomeIsMounted(chromeos::DBusMethodCallStatus call_status, + bool is_mounted) { + if (call_status != chromeos::DBUS_METHOD_CALL_SUCCESS) { + LOG(ERROR) << "IsMounted call failed."; + return; + } + if (!is_mounted) + LOG(ERROR) << "Cryptohome is not mounted."; +} +#endif + } // namespace #if defined(ENABLE_SESSION_SERVICE) @@ -526,8 +538,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 = diff --git a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc index 5f450aa..add4ee7 100644 --- a/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc +++ b/chrome/browser/ui/webui/chromeos/cryptohome_web_ui_handler.cc @@ -31,8 +31,7 @@ void CryptohomeWebUIHandler::OnPageLoaded(const base::ListValue* args) { CryptohomeLibrary* cryptohome_library = CrosLibrary::Get()->GetCryptohomeLibrary(); - base::FundamentalValue is_mounted(cryptohome_library->IsMounted()); - SetCryptohomeProperty("is-mounted", is_mounted); + cryptohome_client->IsMounted(GetCryptohomeBoolCallback("is-mounted")); cryptohome_client->TpmIsReady(GetCryptohomeBoolCallback("tpm-is-ready")); base::FundamentalValue tpm_is_enabled(cryptohome_library->TpmIsEnabled()); SetCryptohomeProperty("tpm-is-enabled", tpm_is_enabled); |