[fuchsia] Update Cast app annotation names

Cast app annotations are given the prefix "app." in order for them to
be properly grouped in bugreports.

Bug: 67907746
Test: cast_crash_storage_impl_fuchsia_unittest
Change-Id: I13a526a2e6552b4d3bfee919be29752a518575f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2151308
Commit-Queue: Christopher Whelan <chwhelan@google.com>
Reviewed-by: Michael Spang <spang@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#759927}

chromecast/crash/fuchsia/cast_crash_storage_impl_fuchsia.cc

@@ -7,21 +7,20 @@
 #include <fuchsia/feedback/cpp/fidl.h>
 
 #include "base/fuchsia/fuchsia_logging.h"
-#include "base/strings/string_util.h"
-#include "chromecast/crash/cast_crash_keys.h"
 #include "chromecast/crash/fuchsia/constants.h"
 
 namespace chromecast {
 namespace {
 
-void ConvertToFuchsiaKey(base::StringPiece key, std::string* out) {
-  base::ReplaceChars(key.as_string(), "_", "-", out);
-}
+const char kLastLaunchedApp[] = "app.last-launched";
+const char kCurrentApp[] = "app.current";
+const char kPreviousApp[] = "app.previous";
+const char kStadiaSessionId[] = "stadia-session-id";
 
 fuchsia::feedback::Annotation MakeAnnotation(base::StringPiece key,
                                              base::StringPiece value) {
   fuchsia::feedback::Annotation annotation;
-  ConvertToFuchsiaKey(key, &annotation.key);
+  annotation.key = key.as_string();
   annotation.value = value.as_string();
   return annotation;
 }
@@ -37,40 +36,36 @@ CastCrashStorageImplFuchsia::CastCrashStorageImplFuchsia(
 CastCrashStorageImplFuchsia::~CastCrashStorageImplFuchsia() = default;
 
 void CastCrashStorageImplFuchsia::SetLastLaunchedApp(base::StringPiece app_id) {
-  UpsertAnnotations({MakeAnnotation(crash_keys::kLastApp, app_id)});
+  UpsertAnnotations({MakeAnnotation(kLastLaunchedApp, app_id)});
 }
 
 void CastCrashStorageImplFuchsia::ClearLastLaunchedApp() {
-  UpsertAnnotations(
-      {MakeAnnotation(crash_keys::kLastApp, base::StringPiece())});
+  UpsertAnnotations({MakeAnnotation(kLastLaunchedApp, base::StringPiece())});
 }
 
 void CastCrashStorageImplFuchsia::SetCurrentApp(base::StringPiece app_id) {
-  UpsertAnnotations({MakeAnnotation(crash_keys::kCurrentApp, app_id)});
+  UpsertAnnotations({MakeAnnotation(kCurrentApp, app_id)});
 }
 
 void CastCrashStorageImplFuchsia::ClearCurrentApp() {
-  UpsertAnnotations(
-      {MakeAnnotation(crash_keys::kCurrentApp, base::StringPiece())});
+  UpsertAnnotations({MakeAnnotation(kCurrentApp, base::StringPiece())});
 }
 
 void CastCrashStorageImplFuchsia::SetPreviousApp(base::StringPiece app_id) {
-  UpsertAnnotations({MakeAnnotation(crash_keys::kPreviousApp, app_id)});
+  UpsertAnnotations({MakeAnnotation(kPreviousApp, app_id)});
 }
 
 void CastCrashStorageImplFuchsia::ClearPreviousApp() {
-  UpsertAnnotations(
-      {MakeAnnotation(crash_keys::kPreviousApp, base::StringPiece())});
+  UpsertAnnotations({MakeAnnotation(kPreviousApp, base::StringPiece())});
 }
 
 void CastCrashStorageImplFuchsia::SetStadiaSessionId(
     base::StringPiece session_id) {
-  UpsertAnnotations({MakeAnnotation(crash_keys::kStadiaSessionId, session_id)});
+  UpsertAnnotations({MakeAnnotation(kStadiaSessionId, session_id)});
 }
 
 void CastCrashStorageImplFuchsia::ClearStadiaSessionId() {
-  UpsertAnnotations(
-      {MakeAnnotation(crash_keys::kStadiaSessionId, base::StringPiece())});
+  UpsertAnnotations({MakeAnnotation(kStadiaSessionId, base::StringPiece())});
 }
 
 void CastCrashStorageImplFuchsia::UpsertAnnotations(
@@ -78,10 +73,6 @@ void CastCrashStorageImplFuchsia::UpsertAnnotations(
   fuchsia::feedback::ComponentDataRegisterPtr component_data_register;
   incoming_directory_->Connect<fuchsia::feedback::ComponentDataRegister>(
       component_data_register.NewRequest());
-  component_data_register.set_error_handler([](zx_status_t status) {
-    ZX_CHECK(status == ZX_OK, status)
-        << "Unable to connect to Feedback service.";
-  });
 
   fuchsia::feedback::ComponentData component_data;
   component_data.set_namespace_(crash::kCastNamespace);

chromecast/crash/fuchsia/cast_crash_storage_impl_fuchsia_unittest.cc

@@ -16,7 +16,6 @@
 #include "base/fuchsia/scoped_service_binding.h"
 #include "base/run_loop.h"
 #include "base/test/task_environment.h"
-#include "chromecast/crash/cast_crash_keys.h"
 #include "chromecast/crash/fuchsia/constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -100,7 +99,7 @@ class CastCrashStorageImplFuchsiaTest : public ::testing::Test {
 
 TEST_F(CastCrashStorageImplFuchsiaTest, LastLaunchedApp) {
   fuchsia::feedback::Annotation annotation;
-  annotation.key = "last-app";
+  annotation.key = "app.last-launched";
   annotation.value = "last_launched_app_id";
 
   cast_crash_storage_->SetLastLaunchedApp("last_launched_app_id");
@@ -110,7 +109,7 @@ TEST_F(CastCrashStorageImplFuchsiaTest, LastLaunchedApp) {
 
 TEST_F(CastCrashStorageImplFuchsiaTest, CurrentApp) {
   fuchsia::feedback::Annotation annotation;
-  annotation.key = "current-app";
+  annotation.key = "app.current";
   annotation.value = "current_app_id";
 
   cast_crash_storage_->SetCurrentApp("current_app_id");
@@ -120,7 +119,7 @@ TEST_F(CastCrashStorageImplFuchsiaTest, CurrentApp) {
 
 TEST_F(CastCrashStorageImplFuchsiaTest, PreviousApp) {
   fuchsia::feedback::Annotation annotation;
-  annotation.key = "previous-app";
+  annotation.key = "app.previous";
   annotation.value = "previous_app_id";
 
   cast_crash_storage_->SetPreviousApp("previous_app_id");