Deprecating tracked_directories as a Vault parameter

cryptohome.cc

Index: cryptohome.cc
diff --git a/cryptohome.cc b/cryptohome.cc
index 0a8c3e508d8d0cc3808d97535444d112140e8028..d8aea4ac5f1f5e3a47a3f841ec69d6ca06c8f14a 100644
--- a/cryptohome.cc
+++ b/cryptohome.cc
@@ -72,7 +72,6 @@ namespace switches {
   static const char kForceSwitch[] = "force";
   static const char kAsyncSwitch[] = "async";
   static const char kCreateSwitch[] = "create";
-  static const char kTrackedDirsSwitch[] = "tracked_dirs";
 }  // namespace switches
 
 chromeos::Blob GetSystemSalt(const chromeos::dbus::Proxy& proxy) {
@@ -292,22 +291,6 @@ int main(int argc, char **argv) {
                 StringPrintf("Enter the password for <%s>", user.c_str()),
                 &password);
 
-    const char** tracked_subdirectories = NULL;
-    // Defined outside to keep the values in-scope for use in the functions
-    // below
-    std::vector<std::string> tracked_dirs;
-    if (cl->HasSwitch(switches::kTrackedDirsSwitch)) {
-      SplitString(cl->GetSwitchValueASCII(switches::kTrackedDirsSwitch), ',',
-                  &tracked_dirs);
-      tracked_subdirectories = new const char*[tracked_dirs.size() + 1];
-      int i = 0;
-      for (std::vector<std::string>::const_iterator itr = tracked_dirs.begin();
-           itr != tracked_dirs.end(); itr++, i++) {
-        tracked_subdirectories[i] = itr->c_str();
-      }
-      tracked_subdirectories[i] = NULL;
-    }
-
     gboolean done = false;
     gint mount_error = 0;
     chromeos::glib::ScopedError error;
@@ -317,8 +300,8 @@ int main(int argc, char **argv) {
                user.c_str(),
                password.c_str(),
                cl->HasSwitch(switches::kCreateSwitch),
-               (tracked_subdirectories != NULL),
-               tracked_subdirectories,
+               false,
+               NULL,
                &mount_error,
                &done,
                &chromeos::Resetter(&error).lvalue())) {
@@ -333,8 +316,8 @@ int main(int argc, char **argv) {
                user.c_str(),
                password.c_str(),
                cl->HasSwitch(switches::kCreateSwitch),
-               (tracked_subdirectories != NULL),
-               tracked_subdirectories,
+               false,
+               NULL,
                &async_id,
                &chromeos::Resetter(&error).lvalue())) {
         printf("Mount call failed: %s.\n", error->message);
@@ -343,9 +326,6 @@ int main(int argc, char **argv) {
         done = client_loop.get_return_status();
       }
     }
-    if (tracked_subdirectories) {
-      delete(tracked_subdirectories);
-    }
     if (!done) {
       printf("Mount failed.\n");
     } else {
@@ -600,13 +580,6 @@ int main(int argc, char **argv) {
       printf("  Password rounds:\n");
       printf("    %d\n", serialized.password_rounds());
     }
-    if (serialized.tracked_subdirectories_size()) {
-      printf("  Tracked subdirectories:\n");
-      for (int index = 0; index < serialized.tracked_subdirectories_size();
-           index++) {
-        printf("    %s\n", serialized.tracked_subdirectories(index).c_str());
-      }
-    }
   } else if (!strcmp(switches::kActions[switches::ACTION_TPM_STATUS],
                      action.c_str())) {
     chromeos::glib::ScopedError error;