commit 37843a9f8a46cd5afa57505bdb6d75aa1a75c9d2
author Mike Frysinger <vapier@chromium.org> Tue Jun 11 17:03:59 2013 -0400
committer ChromeBot <chrome-bot@google.com> Tue Jun 11 17:52:51 2013 -0700
tree 4989545af10cd5937ba02b329b8fe7c0e565a6b8
parent 20980d71ee3c6639f8ba928b0c660da3989dc9aa

crash_collector: add /crash to the user crash path

The recent multiprofile work forgot to append /crash to the user-specific
crash path.  It was in the fallback path, but not the dynamic one.

BUG=chromium:248629
TEST=`cros_run_unit_tests --board=x86-alex -p crash-reporter` works
TEST=`cbuildbot x86-generic-full` works

Change-Id: If87848526b0e78f3f76fd412b0f46e37b7022bd6
Reviewed-on: https://gerrit.chromium.org/gerrit/58232
Reviewed-by: Chris Masone <cmasone@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

crash_reporter/crash_collector.cc

diff --git a/crash_reporter/crash_collector.cc b/crash_reporter/crash_collector.cc
index 55fdd57..b433bec 100644
--- a/crash_reporter/crash_collector.cc
+++ b/crash_reporter/crash_collector.cc
@@ -196,7 +196,8 @@
   GList *list = g_hash_table_get_values(active_sessions);
   if (list) {
     const char *salted_path = static_cast<const char *>(list->data);
-    user_path = chromeos::cryptohome::home::GetHashedUserPath(salted_path);
+    user_path = chromeos::cryptohome::home::GetHashedUserPath(salted_path)
+        .Append("crash");
     g_list_free(list);
   }
 

crash_reporter/crash_collector_test.cc

diff --git a/crash_reporter/crash_collector_test.cc b/crash_reporter/crash_collector_test.cc
index b9a48a0..64a8653 100644
--- a/crash_reporter/crash_collector_test.cc
+++ b/crash_reporter/crash_collector_test.cc
@@ -139,7 +139,7 @@
                                           &directory_mode,
                                           &directory_owner,
                                           &directory_group);
-  EXPECT_EQ("/home/user/hashcakes", path.value());
+  EXPECT_EQ("/home/user/hashcakes/crash", path.value());
   EXPECT_EQ(kExpectedUserMode, directory_mode);
   EXPECT_EQ(kChronosUid, directory_owner);
   EXPECT_EQ(kChronosGid, directory_group);