Deprecating tracked_directories as a Vault parameter

service.cc

 // Copyright (c) 2009 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.
 
 #include "service.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <base/file_util.h>
@@ skipping 315 matching lines @@
 }
 
 gboolean Service::IsMounted(gboolean *OUT_is_mounted, GError **error) {
   *OUT_is_mounted = mount_->IsCryptohomeMounted();
   return TRUE;
 }
 
 gboolean Service::Mount(gchar *userid,
                         gchar *key,
                         gboolean create_if_missing,
-                        gboolean replace_tracked_subdirectories,
-                        gchar** tracked_subdirectories,
+                        gboolean deprecated_replace_tracked_subdirectories,
+                        gchar** deprecated_tracked_subdirectories,
                         gint *OUT_error_code,
                         gboolean *OUT_result,
                         GError **error) {
   UsernamePasskey credentials(userid, SecureBlob(key, strlen(key)));
 
   if (mount_->IsCryptohomeMounted()) {
     if (mount_->IsCryptohomeMountedForUser(credentials)) {
       LOG(INFO) << "Cryptohome already mounted for this user";
       *OUT_error_code = Mount::MOUNT_ERROR_NONE;
       *OUT_result = TRUE;
       return TRUE;
     } else {
       if (!mount_->UnmountCryptohome()) {
         LOG(ERROR) << "Could not unmount cryptohome from previous user";
         *OUT_error_code = Mount::MOUNT_ERROR_MOUNT_POINT_BUSY;
         *OUT_result = FALSE;
         return TRUE;
       }
     }
   }
 
   MountTaskResult result;
   base::WaitableEvent event(true, false);
   Mount::MountArgs mount_args;
   mount_args.create_if_missing = create_if_missing;
-  mount_args.replace_tracked_subdirectories = replace_tracked_subdirectories;
-  if (tracked_subdirectories) {
-    mount_args.AssignSubdirsNullTerminatedList(
-        const_cast<const char**>(tracked_subdirectories));
-  }
   MountTaskMount* mount_task = new MountTaskMount(NULL,
                                                   mount_,
                                                   credentials,
                                                   mount_args);
   mount_task->set_result(&result);
   mount_task->set_complete_event(&event);
   mount_thread_.message_loop()->PostTask(FROM_HERE, mount_task);
   event.Wait();
   *OUT_error_code = result.return_code();
   *OUT_result = result.return_status();
   return TRUE;
 }
 
 gboolean Service::AsyncMount(gchar *userid,
                              gchar *key,
                              gboolean create_if_missing,
-                             gboolean replace_tracked_subdirectories,
-                             gchar** tracked_subdirectories,
+                             gboolean deprecated_replace_tracked_subdirectories,
+                             gchar** deprecated_tracked_subdirectories,
                              gint *OUT_async_id,
                              GError **error) {
   UsernamePasskey credentials(userid, SecureBlob(key, strlen(key)));
 
   if (mount_->IsCryptohomeMounted()) {
     if (mount_->IsCryptohomeMountedForUser(credentials)) {
       LOG(INFO) << "Cryptohome already mounted for this user";
       MountTaskNop* mount_task = new MountTaskNop(this);
       mount_task->result()->set_return_code(Mount::MOUNT_ERROR_NONE);
       mount_task->result()->set_return_status(true);
       *OUT_async_id = mount_task->sequence_id();
       mount_thread_.message_loop()->PostTask(FROM_HERE, mount_task);
       return TRUE;
     } else {
       if (!mount_->UnmountCryptohome()) {
         LOG(ERROR) << "Could not unmount cryptohome from previous user";
         MountTaskNop* mount_task = new MountTaskNop(this);
         mount_task->result()->set_return_code(
             Mount::MOUNT_ERROR_MOUNT_POINT_BUSY);
         mount_task->result()->set_return_status(false);
         *OUT_async_id = mount_task->sequence_id();
         mount_thread_.message_loop()->PostTask(FROM_HERE, mount_task);
         return TRUE;
       }
     }
   }
 
   Mount::MountArgs mount_args;
   mount_args.create_if_missing = create_if_missing;
-  mount_args.replace_tracked_subdirectories = replace_tracked_subdirectories;
-  if (tracked_subdirectories) {
-    mount_args.AssignSubdirsNullTerminatedList(
-        const_cast<const char**>(tracked_subdirectories));
-  }
   MountTaskMount* mount_task = new MountTaskMount(this,
                                                   mount_,
                                                   credentials,
                                                   mount_args);
   *OUT_async_id = mount_task->sequence_id();
   mount_thread_.message_loop()->PostTask(FROM_HERE, mount_task);
   return TRUE;
 }
 
 gboolean Service::MountGuest(gint *OUT_error_code,
@@ skipping 205 matching lines @@
       (tpm_status.CanDecrypt ? "1" : "0"),
       (tpm_status.ThisInstanceHasContext ? "1" : "0"),
       (tpm_status.ThisInstanceHasKeyHandle ? "1" : "0"),
       tpm_status.LastTpmError,
       user_data.c_str(),
       (mount_->IsCryptohomeMounted() ? "1" : "0"));
   return TRUE;
 }
 
 }  // namespace cryptohome