Deprecating tracked_directories as a Vault parameter

mount.cc

 // Copyright (c) 2009-2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Contains the implementation of class Mount
 
 #include "mount.h"
 
 #include <errno.h>
 
@@ skipping 217 matching lines @@
       // If the mount was successful, set the status to indicate that the
       // cryptohome was recreated.
       if (local_result && mount_error) {
         *mount_error = MOUNT_ERROR_RECREATED;
       }
       return local_result;
     }
     return false;
   }
 
-  // TODO(glotov): the following code is deprecated. Remove it.
-  if (mount_args.replace_tracked_subdirectories) {
-    if (ReplaceTrackedSubdirectories(mount_args.tracked_subdirectories,
-                                     &serialized)) {
-      // If the tracked subdirectories changed, re-save the vault keyset
-      StoreVaultKeyset(credentials, serialized);
-    }
-  }
-
   crypto_->ClearKeyset();
 
   // Add the decrypted key to the keyring so that ecryptfs can use it
   string key_signature, fnek_signature;
   if (!crypto_->AddKeyset(vault_keyset, &key_signature, &fnek_signature)) {
     LOG(INFO) << "Cryptohome mount failed because of keyring failure.";
     if (mount_error) {
       *mount_error = MOUNT_ERROR_FATAL;
     }
     return false;
@@ skipping 100 matching lines @@
 }
 
 bool Mount::CreateCryptohome(const Credentials& credentials,
                              const Mount::MountArgs& mount_args) const {
   int original_mask = platform_->SetMask(kDefaultUmask);
 
   // Create the user's entry in the shadow root
   FilePath user_dir(GetUserDirectory(credentials));
   file_util::CreateDirectory(user_dir);
 
-  // Generat a new master key
+  // Generate a new master key
   VaultKeyset vault_keyset;
   vault_keyset.CreateRandom(*this);
   SerializedVaultKeyset serialized;
-  ReplaceTrackedSubdirectories(mount_args.tracked_subdirectories, &serialized);
   if (!AddVaultKeyset(credentials, vault_keyset, &serialized)) {
     platform_->SetMask(original_mask);
     return false;
   }
   if (!StoreVaultKeyset(credentials, serialized)) {
     platform_->SetMask(original_mask);
     return false;
   }
 
   // Create the user's path and set the proper ownership
@@ skipping 99 matching lines @@
       }
       file_util::Delete(tmp_migrated_dir, true);
     }
   }
 
   // Restore the umask
   platform_->SetMask(original_mask);
   return result;
 }
 
-bool Mount::ReplaceTrackedSubdirectories(
-      const std::vector<std::string>& tracked_subdirectories,
-      SerializedVaultKeyset* serialized) const {
-  std::set<std::string> existing;
-  for (int index = 0; index < serialized->tracked_subdirectories_size();
-       ++index) {
-    existing.insert(serialized->tracked_subdirectories(index));
-  }
-  bool new_exists = false;
-  for (std::vector<std::string>::const_iterator itr =
-       tracked_subdirectories.begin();
-       itr != tracked_subdirectories.end();
-       ++itr) {
-    if (!existing.erase(*itr)) {
-      new_exists = true;
-    }
-  }
-  // If there are any subdirectories that were in one set but not the other,
-  // then we need to replace
-  if (existing.size() || new_exists) {
-    serialized->clear_tracked_subdirectories();
-    for (std::vector<std::string>::const_iterator itr =
-         tracked_subdirectories.begin();
-         itr != tracked_subdirectories.end();
-         ++itr) {
-      serialized->add_tracked_subdirectories(*itr);
-    }
-    return true;
-  }
-  return false;
-}
-
 void Mount::CleanUnmountedTrackedSubdirectories() const {
   FilePath shadow_root(shadow_root_);
   file_util::FileEnumerator dir_enumerator(shadow_root, false,
       file_util::FileEnumerator::DIRECTORIES);
   for (FilePath next_path = dir_enumerator.Next(); !next_path.empty();
        next_path = dir_enumerator.Next()) {
     FilePath dir_name = next_path.BaseName();
     string str_dir_name = dir_name.value();
     if (str_dir_name.length() != kUserDirNameLength) {
       continue;
@@ skipping 558 matching lines @@
     if (error) {
       *error = Mount::MOUNT_ERROR_KEY_FAILURE;
     }
     return false;
   }
 
   return true;
 }
 
 } // namespace cryptohome