Switch CryptohomeAuthenticator from MountAsync() to MountEx()

chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc

Index: chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
index 8918f93a819bc3959409b868be823ebfd3de445b..89f94c142369d4ef6e2b3f5f01f971ecac06c17c 100644
--- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
@@ -26,8 +26,12 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "chromeos/chromeos_switches.h"
+#include "chromeos/cryptohome/cryptohome_parameters.h"
+#include "chromeos/cryptohome/homedir_methods.h"
 #include "chromeos/cryptohome/mock_async_method_caller.h"
+#include "chromeos/cryptohome/mock_homedir_methods.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
+#include "chromeos/dbus/cros_disks_client.h"
 #include "chromeos/dbus/fake_cryptohome_client.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/login/auth/key.h"
@@ -118,6 +122,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {
         user_manager_(new FakeUserManager()),
         user_manager_enabler_(user_manager_),
         mock_caller_(NULL),
+        mock_homedir_methods_(NULL),
         owner_key_util_(new MockOwnerKeyUtil) {
     user_context_.SetKey(Key("fakepass"));
     user_context_.SetUserIDHash("me_nowhere_com_hash");
@@ -140,6 +145,9 @@ class CryptohomeAuthenticatorTest : public testing::Test {
 
     mock_caller_ = new cryptohome::MockAsyncMethodCaller;
     cryptohome::AsyncMethodCaller::InitializeForTesting(mock_caller_);
+    mock_homedir_methods_ = new cryptohome::MockHomedirMethods;
+    mock_homedir_methods_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);
+    cryptohome::HomedirMethods::InitializeForTesting(mock_homedir_methods_);
 
     FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
     fake_cryptohome_client_ = new FakeCryptohomeClient;
@@ -163,6 +171,8 @@ class CryptohomeAuthenticatorTest : public testing::Test {
 
     cryptohome::AsyncMethodCaller::Shutdown();
     mock_caller_ = NULL;
+    cryptohome::HomedirMethods::Shutdown();
+    mock_homedir_methods_ = NULL;
   }
 
   base::FilePath PopulateTempFile(const char* data, int data_len) {
@@ -266,6 +276,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {
   ScopedUserManagerEnabler user_manager_enabler_;
 
   cryptohome::MockAsyncMethodCaller* mock_caller_;
+  cryptohome::MockHomedirMethods* mock_homedir_methods_;
 
   MockAuthStatusConsumer consumer_;
 
@@ -531,23 +542,27 @@ TEST_F(CryptohomeAuthenticatorTest, DriveDataResync) {
   FailOnLoginFailure();
 
   // Set up mock async method caller to respond successfully to a cryptohome
-  // remove attempt and a cryptohome create attempt (indicated by the
-  // |CREATE_IF_MISSING| flag to AsyncMount).
+  // remove attempt.
   mock_caller_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);
   EXPECT_CALL(*mock_caller_, AsyncRemove(user_context_.GetUserID(), _))
       .Times(1)
       .RetiresOnSaturation();
-  EXPECT_CALL(*mock_caller_,
-              AsyncMount(user_context_.GetUserID(),
-                         transformed_key_.GetSecret(),
-                         cryptohome::CREATE_IF_MISSING,
-                         _))
-      .Times(1)
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_caller_,
-              AsyncGetSanitizedUsername(user_context_.GetUserID(), _))
-      .Times(1)
-      .RetiresOnSaturation();
+
+  // Set up mock homedir methods to respond successfully to a cryptohome create
+  // attempt.
+  const cryptohome::KeyDefinition auth_key(transformed_key_.GetSecret(),
+                                           std::string(),
+                                           cryptohome::PRIV_DEFAULT);
+  cryptohome::MountParameters mount(false /* ephemeral */);
+  mount.create_keys.push_back(cryptohome::KeyDefinition(
+      transformed_key_.GetSecret(),
+      "gaia",
+      cryptohome::PRIV_DEFAULT));
+  EXPECT_CALL(*mock_homedir_methods_,
+              MountEx(cryptohome::Identification(user_context_.GetUserID()),
+                      cryptohome::Authorization(auth_key),
+                      mount,
+                      _));

[Darren Krahn, 2014/08/26 17:59:47]

optional: Multiple calls to MountEx should be avoided, is this something you
want to check with a Times(1)?

[bartfab (slow), 2014/08/26 18:10:22]

Done.

 
   state_->PresetOnlineLoginStatus(AuthFailure::AuthFailureNone());
   SetAttemptState(auth_.get(), state_.release());
@@ -598,17 +613,17 @@ TEST_F(CryptohomeAuthenticatorTest, DriveDataRecover) {
           user_context_.GetUserID(), _, transformed_key_.GetSecret(), _))
       .Times(1)
       .RetiresOnSaturation();
-  EXPECT_CALL(*mock_caller_,
-              AsyncMount(user_context_.GetUserID(),
-                         transformed_key_.GetSecret(),
-                         cryptohome::MOUNT_FLAGS_NONE,
-                         _))
-      .Times(1)
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_caller_,
-              AsyncGetSanitizedUsername(user_context_.GetUserID(), _))
-      .Times(1)
-      .RetiresOnSaturation();
+
+  // Set up mock homedir methods to respond successfully to a cryptohome mount
+  // attempt.
+  const cryptohome::KeyDefinition auth_key(transformed_key_.GetSecret(),
+                                           std::string(),
+                                           cryptohome::PRIV_DEFAULT);
+  EXPECT_CALL(*mock_homedir_methods_,
+              MountEx(cryptohome::Identification(user_context_.GetUserID()),
+                      cryptohome::Authorization(auth_key),
+                      cryptohome::MountParameters(false /* ephemeral */),
+                      _));
 
   state_->PresetOnlineLoginStatus(AuthFailure::AuthFailureNone());
   SetAttemptState(auth_.get(), state_.release());
@@ -668,20 +683,21 @@ TEST_F(CryptohomeAuthenticatorTest, DriveCreateForNewUser) {
   ExpectLoginSuccess(expected_user_context);
   FailOnLoginFailure();
 
-  // Set up mock async method caller to respond successfully to a cryptohome
-  // create attempt (indicated by the |CREATE_IF_MISSING| flag to AsyncMount).
-  mock_caller_->SetUp(true, cryptohome::MOUNT_ERROR_NONE);
-  EXPECT_CALL(*mock_caller_,
-              AsyncMount(user_context_.GetUserID(),
-                         transformed_key_.GetSecret(),
-                         cryptohome::CREATE_IF_MISSING,
-                         _))
-      .Times(1)
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_caller_,
-              AsyncGetSanitizedUsername(user_context_.GetUserID(), _))
-      .Times(1)
-      .RetiresOnSaturation();
+  // Set up mock homedir methods to respond successfully to a cryptohome create
+  // attempt.
+  const cryptohome::KeyDefinition auth_key(transformed_key_.GetSecret(),
+                                           std::string(),
+                                           cryptohome::PRIV_DEFAULT);
+  cryptohome::MountParameters mount(false /* ephemeral */);
+  mount.create_keys.push_back(cryptohome::KeyDefinition(
+      transformed_key_.GetSecret(),
+      "gaia",
+      cryptohome::PRIV_DEFAULT));
+  EXPECT_CALL(*mock_homedir_methods_,
+              MountEx(cryptohome::Identification(user_context_.GetUserID()),
+                      cryptohome::Authorization(auth_key),
+                      mount,
+                      _));
 
   // Set up state as though a cryptohome mount attempt has occurred
   // and been rejected because the user doesn't exist; additionally,