Commit 1ba77680 authored by Mike Dougherty's avatar Mike Dougherty Committed by Commit Bot

[iOS] Rename breadcrumb crash report key

BrowserState and application wide breadcrumbs are combined and attached
to crash reports under a single key. Rename this key to a more
appropriate name.

Bug: 1003922
Change-Id: Ic1c6cb04d5d1047c090c51fdc5e5df82c78cacb2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013816
Commit-Queue: Mike Dougherty <michaeldo@chromium.org>
Auto-Submit: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#734162}
parent f273cbf9
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
namespace breakpad_helper { namespace breakpad_helper {
// Key for breadcrumbs attached to crash reports.
extern NSString* const kBreadcrumbs;
// Starts the crash handlers. This must be run as soon as possible to catch // Starts the crash handlers. This must be run as soon as possible to catch
// early crashes. // early crashes.
void Start(const std::string& channel_name); void Start(const std::string& channel_name);
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
namespace breakpad_helper { namespace breakpad_helper {
NSString* const kBreadcrumbs = @"breadcrumbs";
namespace { namespace {
// Key in NSUserDefaults for a Boolean value that stores whether to upload // Key in NSUserDefaults for a Boolean value that stores whether to upload
...@@ -51,7 +53,6 @@ NSString* const kMemoryWarningCount = @"memory_warning_count"; ...@@ -51,7 +53,6 @@ NSString* const kMemoryWarningCount = @"memory_warning_count";
NSString* const kUptimeAtRestoreInMs = @"uptime_at_restore_in_ms"; NSString* const kUptimeAtRestoreInMs = @"uptime_at_restore_in_ms";
NSString* const kUploadedInRecoveryMode = @"uploaded_in_recovery_mode"; NSString* const kUploadedInRecoveryMode = @"uploaded_in_recovery_mode";
NSString* const kGridToVisibleTabAnimation = @"grid_to_visible_tab_animation"; NSString* const kGridToVisibleTabAnimation = @"grid_to_visible_tab_animation";
NSString* const kBrowserStateBreadcrumbs = @"browser_state_breadcrumbs";
// Multiple state information are combined into one CrachReportMultiParameter // Multiple state information are combined into one CrachReportMultiParameter
// to save limited and finite number of ReportParameters. // to save limited and finite number of ReportParameters.
...@@ -374,7 +375,7 @@ void RemoveGridToVisibleTabAnimation() { ...@@ -374,7 +375,7 @@ void RemoveGridToVisibleTabAnimation() {
} }
void SetBreadcrumbEvents(NSString* breadcrumbs) { void SetBreadcrumbEvents(NSString* breadcrumbs) {
AddReportParameter(kBrowserStateBreadcrumbs, breadcrumbs, true); AddReportParameter(breakpad_helper::kBreadcrumbs, breadcrumbs, true);
} }
void MediaStreamPlaybackDidStart() { void MediaStreamPlaybackDidStart() {
......
...@@ -117,7 +117,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest, EventsAttachedToCrashReport) { ...@@ -117,7 +117,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest, EventsAttachedToCrashReport) {
}]; }];
[[mock_breakpad_controller_ expect] [[mock_breakpad_controller_ expect]
addUploadParameter:breadcrumbs_param_vaidation_block addUploadParameter:breadcrumbs_param_vaidation_block
forKey:@"browser_state_breadcrumbs"]; forKey:breakpad_helper::kBreadcrumbs];
breadcrumb_service->AddEvent(std::string("Breadcrumb Event")); breadcrumb_service->AddEvent(std::string("Breadcrumb Event"));
EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_); EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
...@@ -145,7 +145,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest, ...@@ -145,7 +145,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest,
[[mock_breakpad_controller_ expect] [[mock_breakpad_controller_ expect]
addUploadParameter:StringParameterValidatorWithCountOfSubstring( addUploadParameter:StringParameterValidatorWithCountOfSubstring(
1, event_nsstring) 1, event_nsstring)
forKey:@"browser_state_breadcrumbs"]; forKey:breakpad_helper::kBreadcrumbs];
breadcrumb_service->AddEvent(event); breadcrumb_service->AddEvent(event);
ios::ChromeBrowserState* otr_browser_state = ios::ChromeBrowserState* otr_browser_state =
...@@ -159,7 +159,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest, ...@@ -159,7 +159,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest,
[[mock_breakpad_controller_ expect] [[mock_breakpad_controller_ expect]
addUploadParameter:StringParameterValidatorWithCountOfSubstring( addUploadParameter:StringParameterValidatorWithCountOfSubstring(
2, event_nsstring) 2, event_nsstring)
forKey:@"browser_state_breadcrumbs"]; forKey:breakpad_helper::kBreadcrumbs];
otr_breadcrumb_service->AddEvent(event); otr_breadcrumb_service->AddEvent(event);
TestChromeBrowserState::Builder test_cbs_builder; TestChromeBrowserState::Builder test_cbs_builder;
...@@ -174,7 +174,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest, ...@@ -174,7 +174,7 @@ TEST_F(CrashReporterBreadcrumbObserverTest,
[[mock_breakpad_controller_ expect] [[mock_breakpad_controller_ expect]
addUploadParameter:StringParameterValidatorWithCountOfSubstring( addUploadParameter:StringParameterValidatorWithCountOfSubstring(
3, event_nsstring) 3, event_nsstring)
forKey:@"browser_state_breadcrumbs"]; forKey:breakpad_helper::kBreadcrumbs];
breadcrumb_service_2->AddEvent(event); breadcrumb_service_2->AddEvent(event);
EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_); EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment