[crash] inline Crashpad database path definition
* we always use /tmp/crashes so no need to expose it in the config
TESTED=`fx run-test crashpad_agent_tests`
TESTED=`crasher`
TESTED=`k crash`
Change-Id: I384556aa45719d465577ee1e214556ead6333caf
diff --git a/src/developer/feedback/crashpad_agent/config.cc b/src/developer/feedback/crashpad_agent/config.cc
index 70e0d54..b6cad14 100644
--- a/src/developer/feedback/crashpad_agent/config.cc
+++ b/src/developer/feedback/crashpad_agent/config.cc
@@ -23,15 +23,11 @@
"crashpad_database": {
"type": "object",
"properties": {
- "path": {
- "type": "string"
- },
"max_size_in_kb": {
"type": "integer"
}
},
"required": [
- "path",
"max_size_in_kb"
],
"additionalProperties": false
@@ -90,7 +86,6 @@
template <typename JsonObject>
CrashpadDatabaseConfig ParseCrashpadDatabaseConfig(const JsonObject& obj) {
CrashpadDatabaseConfig config;
- config.path = obj[kCrashpadDatabasePathKey].GetString();
config.max_size_in_kb = obj[kCrashpadDatabaseMaxSizeInKbKey].GetUint();
return config;
}
diff --git a/src/developer/feedback/crashpad_agent/config.h b/src/developer/feedback/crashpad_agent/config.h
index b8cf5c6..e57bd2a 100644
--- a/src/developer/feedback/crashpad_agent/config.h
+++ b/src/developer/feedback/crashpad_agent/config.h
@@ -14,9 +14,6 @@
namespace feedback {
struct CrashpadDatabaseConfig {
- // Directory path under which to store the Crashpad database.
- std::string path;
-
// Maximum size (in kilobytes) that the Crashpad database should grow to, excluding current
// reports being generated.
uint64_t max_size_in_kb;
diff --git a/src/developer/feedback/crashpad_agent/configs/default.json b/src/developer/feedback/crashpad_agent/configs/default.json
index 8b51509..5e057f9 100644
--- a/src/developer/feedback/crashpad_agent/configs/default.json
+++ b/src/developer/feedback/crashpad_agent/configs/default.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/tmp/crashes",
"max_size_in_kb": 51200
},
"crash_server": {
diff --git a/src/developer/feedback/crashpad_agent/configs/upload_to_prod_server.json b/src/developer/feedback/crashpad_agent/configs/upload_to_prod_server.json
index 1ea572b..20398fd 100644
--- a/src/developer/feedback/crashpad_agent/configs/upload_to_prod_server.json
+++ b/src/developer/feedback/crashpad_agent/configs/upload_to_prod_server.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/tmp/crashes",
"max_size_in_kb": 51200
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/crashpad_agent.cc b/src/developer/feedback/crashpad_agent/crashpad_agent.cc
index 88e301c..dfdf0ed 100644
--- a/src/developer/feedback/crashpad_agent/crashpad_agent.cc
+++ b/src/developer/feedback/crashpad_agent/crashpad_agent.cc
@@ -22,9 +22,7 @@
#include "src/developer/feedback/crashpad_agent/feedback_data_provider_ptr.h"
#include "src/developer/feedback/crashpad_agent/report_util.h"
#include "src/developer/feedback/crashpad_agent/scoped_unlink.h"
-#include "src/lib/files/directory.h"
#include "src/lib/files/file.h"
-#include "src/lib/files/unique_fd.h"
#include "src/lib/fxl/strings/string_printf.h"
#include "src/lib/syslog/cpp/logger.h"
@@ -93,14 +91,8 @@
std::unique_ptr<CrashpadAgent> CrashpadAgent::TryCreate(
async_dispatcher_t* dispatcher, std::shared_ptr<sys::ServiceDirectory> services, Config config,
std::unique_ptr<CrashServer> crash_server, InspectManager* inspect_manager) {
- if (!files::IsDirectory(config.crashpad_database.path)) {
- files::CreateDirectory(config.crashpad_database.path);
- }
-
auto database = Database::TryCreate(config.crashpad_database);
if (!database) {
- FX_LOGS(ERROR) << "Error initializing local crash report database at "
- << config.crashpad_database.path;
FX_LOGS(FATAL) << "Failed to set up crash analyzer";
return nullptr;
}
@@ -190,9 +182,9 @@
bool CrashpadAgent::UploadReport(const crashpad::UUID& local_report_id) {
if (settings_.upload_policy() == Settings::UploadPolicy::DISABLED) {
- FX_LOGS(INFO) << "Upload to remote crash server disabled. Local crash report, ID "
- << local_report_id.ToString() << ", available under "
- << config_.crashpad_database.path;
+ FX_LOGS(INFO) << fxl::StringPrintf(
+ "Upload to remote crash server disabled. Local crash report, ID %s, available under %s",
+ local_report_id.ToString().c_str(), database_->path());
if (!database_->Archive(local_report_id)) {
FX_LOGS(ERROR) << "Error archiving local report " << local_report_id.ToString();
}
diff --git a/src/developer/feedback/crashpad_agent/database.cc b/src/developer/feedback/crashpad_agent/database.cc
index a3201118..481897a 100644
--- a/src/developer/feedback/crashpad_agent/database.cc
+++ b/src/developer/feedback/crashpad_agent/database.cc
@@ -7,6 +7,7 @@
#include <memory>
#include "src/developer/feedback/crashpad_agent/report_util.h"
+#include "src/lib/files/directory.h"
#include "src/lib/fxl/logging.h"
#include "src/lib/fxl/strings/string_printf.h"
#include "src/lib/syslog/cpp/logger.h"
@@ -20,11 +21,18 @@
using CrashSkippedReason = crashpad::Metrics::CrashSkippedReason;
using OperationStatus = crashpad::CrashReportDatabase::OperationStatus;
+constexpr char kCrashpadDatabasePath[] = "/tmp/crashes";
+
std::unique_ptr<Database> Database::TryCreate(CrashpadDatabaseConfig config) {
- auto crashpad_database = crashpad::CrashReportDatabase::Initialize(base::FilePath(config.path));
+ if (!files::IsDirectory(kCrashpadDatabasePath)) {
+ files::CreateDirectory(kCrashpadDatabasePath);
+ }
+
+ auto crashpad_database =
+ crashpad::CrashReportDatabase::Initialize(base::FilePath(kCrashpadDatabasePath));
if (!crashpad_database) {
FX_LOGS(ERROR) << fxl::StringPrintf("Error initializing local crash report database at %s",
- config.path.c_str());
+ kCrashpadDatabasePath);
return nullptr;
}
@@ -37,6 +45,8 @@
FXL_DCHECK(database_);
}
+const char* Database::path() { return kCrashpadDatabasePath; }
+
bool Database::MakeNewReport(const std::map<std::string, fuchsia::mem::Buffer>& attachments,
const std::optional<fuchsia::mem::Buffer>& minidump,
const std::map<std::string, std::string>& annotations,
diff --git a/src/developer/feedback/crashpad_agent/database.h b/src/developer/feedback/crashpad_agent/database.h
index a689d99a7..f98a03b 100644
--- a/src/developer/feedback/crashpad_agent/database.h
+++ b/src/developer/feedback/crashpad_agent/database.h
@@ -19,11 +19,14 @@
namespace feedback {
-// Wrapper around Crashpad's CrashReportDatabase that also stores annotations.
+// Wrapper around the Crashpad database that also stores annotations.
class Database {
public:
static std::unique_ptr<Database> TryCreate(CrashpadDatabaseConfig config);
+ // Returns the path to the underlying Crashpad database.
+ const char* path();
+
// Make a new report in |database_|.
//
// Return false if there is an error with the database.
diff --git a/src/developer/feedback/crashpad_agent/inspect_manager.cc b/src/developer/feedback/crashpad_agent/inspect_manager.cc
index 1160237..4508c4f 100644
--- a/src/developer/feedback/crashpad_agent/inspect_manager.cc
+++ b/src/developer/feedback/crashpad_agent/inspect_manager.cc
@@ -80,8 +80,6 @@
auto* crash_server = &config_.crash_server;
crashpad_database->node = config_.node.CreateChild(kCrashpadDatabaseKey);
- crashpad_database->path = config_.crashpad_database.node.CreateString(
- kCrashpadDatabasePathKey, config.crashpad_database.path);
crashpad_database->max_size_in_kb = crashpad_database->node.CreateUint(
kCrashpadDatabaseMaxSizeInKbKey, config.crashpad_database.max_size_in_kb);
diff --git a/src/developer/feedback/crashpad_agent/tests/config_unittest.cc b/src/developer/feedback/crashpad_agent/tests/config_unittest.cc
index 2883748..0d79381 100644
--- a/src/developer/feedback/crashpad_agent/tests/config_unittest.cc
+++ b/src/developer/feedback/crashpad_agent/tests/config_unittest.cc
@@ -19,7 +19,6 @@
CrashServerConfig::UploadPolicy::READ_FROM_PRIVACY_SETTINGS;
void CheckEmptyConfig(const Config& config) {
- EXPECT_EQ(config.crashpad_database.path, "");
EXPECT_EQ(config.crash_server.upload_policy, kDisabled);
EXPECT_EQ(config.crash_server.url, nullptr);
}
@@ -27,7 +26,6 @@
TEST(ConfigTest, ParseConfig_ValidConfig_UploadDisabled) {
Config config;
ASSERT_EQ(ParseConfig("/pkg/data/valid_config_upload_disabled.json", &config), ZX_OK);
- EXPECT_EQ(config.crashpad_database.path, "/foo/crashes");
EXPECT_EQ(config.crashpad_database.max_size_in_kb, 1024u);
EXPECT_EQ(config.crash_server.upload_policy, kDisabled);
EXPECT_EQ(config.crash_server.url, nullptr);
@@ -36,7 +34,6 @@
TEST(ConfigTest, ParseConfig_ValidConfig_UploadEnabled) {
Config config;
ASSERT_EQ(ParseConfig("/pkg/data/valid_config_upload_enabled.json", &config), ZX_OK);
- EXPECT_EQ(config.crashpad_database.path, "/foo/crashes");
EXPECT_EQ(config.crashpad_database.max_size_in_kb, 1024u);
EXPECT_EQ(config.crash_server.upload_policy, kEnabled);
EXPECT_EQ(*config.crash_server.url, "http://localhost:1234");
@@ -46,7 +43,6 @@
Config config;
ASSERT_EQ(ParseConfig("/pkg/data/valid_config_upload_read_from_privacy_settings.json", &config),
ZX_OK);
- EXPECT_EQ(config.crashpad_database.path, "/foo/crashes");
EXPECT_EQ(config.crashpad_database.max_size_in_kb, 1024u);
EXPECT_EQ(config.crash_server.upload_policy, kReadFromPrivacySettings);
EXPECT_EQ(*config.crash_server.url, "http://localhost:1234");
@@ -56,7 +52,6 @@
Config config;
ASSERT_EQ(ParseConfig("/pkg/data/valid_config_upload_disabled_spurious_server.json", &config),
ZX_OK);
- EXPECT_EQ(config.crashpad_database.path, "/foo/crashes");
EXPECT_EQ(config.crashpad_database.max_size_in_kb, 1024u);
EXPECT_EQ(config.crash_server.upload_policy, kDisabled);
// Even though a URL is set in the config file, we check that it is not set in the struct.
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_invalid_upload_policy.json b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_invalid_upload_policy.json
index 3565bb2..e61f3f5 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_invalid_upload_policy.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_invalid_upload_policy.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_required_field.json b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_required_field.json
index 07cb6b3..130fa1b 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_required_field.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_required_field.json
@@ -1,5 +1,5 @@
{
"crashpad_database": {
- "path": "/foo/crashes"
+ "max_size_in_kb": 1024
}
}
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_enabled.json b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_enabled.json
index c2c1f27..2bd9efe 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_enabled.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_enabled.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_read_from_privacy_settings.json b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_read_from_privacy_settings.json
index c2c1f27..2bd9efe 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_read_from_privacy_settings.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_missing_server_upload_read_from_privacy_settings.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_spurious_field.json b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_spurious_field.json
index f4b180c..ba290c6 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_spurious_field.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/bad_schema_spurious_field.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/valid_override.json b/src/developer/feedback/crashpad_agent/tests/configs/valid_override.json
index abbb821..8524adb6 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/valid_override.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/valid_override.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/tmp/crashes",
"max_size_in_kb": 10240
},
"crash_server": {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled.json b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled.json
index 5338bc7..9cd67f8 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled_spurious_server.json b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled_spurious_server.json
index 48b63cd..12cff22 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled_spurious_server.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_disabled_spurious_server.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_enabled.json b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_enabled.json
index 89daef4..69d6e86 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_enabled.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_enabled.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_read_from_privacy_settings.json b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_read_from_privacy_settings.json
index 1b017db..0002845 100644
--- a/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_read_from_privacy_settings.json
+++ b/src/developer/feedback/crashpad_agent/tests/configs/valid_upload_read_from_privacy_settings.json
@@ -1,6 +1,5 @@
{
"crashpad_database" : {
- "path": "/foo/crashes",
"max_size_in_kb": 1024
},
"crash_server" : {
diff --git a/src/developer/feedback/crashpad_agent/tests/crashpad_agent_unittest.cc b/src/developer/feedback/crashpad_agent/tests/crashpad_agent_unittest.cc
index 803437c..11570a3 100644
--- a/src/developer/feedback/crashpad_agent/tests/crashpad_agent_unittest.cc
+++ b/src/developer/feedback/crashpad_agent/tests/crashpad_agent_unittest.cc
@@ -34,7 +34,6 @@
#include "src/lib/files/directory.h"
#include "src/lib/files/file.h"
#include "src/lib/files/path.h"
-#include "src/lib/files/scoped_temp_dir.h"
#include "src/lib/fsl/vmo/strings.h"
#include "src/lib/fxl/logging.h"
#include "src/lib/fxl/test/test_settings.h"
@@ -73,6 +72,8 @@
constexpr bool kUploadSuccessful = true;
constexpr bool kUploadFailed = false;
+constexpr char kCrashpadDatabasePath[] = "/tmp/crashes";
+
// "attachments" should be kept in sync with the value defined in
// //crashpad/client/crash_report_database_generic.cc
constexpr char kCrashpadAttachmentsDir[] = "attachments";
@@ -93,6 +94,10 @@
// This does not test the environment service. It directly instantiates the class, without
// connecting through FIDL.
class CrashpadAgentTest : public gtest::TestLoopFixture {
+ void TearDown() override {
+ ASSERT_TRUE(files::DeletePath(kCrashpadDatabasePath, /*recursive=*/true));
+ }
+
protected:
// Sets up the underlying agent using the given |config| and |crash_server|.
void SetUpAgent(Config config, std::unique_ptr<StubCrashServer> crash_server) {
@@ -100,7 +105,7 @@
(!config.crash_server.url && !crash_server));
crash_server_ = crash_server.get();
- attachments_dir_ = files::JoinPath(config.crashpad_database.path, kCrashpadAttachmentsDir);
+ attachments_dir_ = files::JoinPath(kCrashpadDatabasePath, kCrashpadAttachmentsDir);
inspector_ = std::make_unique<inspect::Inspector>();
clock_ = std::make_unique<timekeeper::TestClock>();
inspect_manager_ = std::make_unique<InspectManager>(&inspector_->GetRoot(), clock_.get());
@@ -121,7 +126,6 @@
SetUpAgent(
Config{/*crashpad_database=*/
{
- /*path=*/database_path_.path(),
/*max_size_in_kb=*/kMaxTotalReportSizeInKb,
},
/*crash_server=*/
@@ -363,7 +367,6 @@
protected:
std::unique_ptr<CrashpadAgent> agent_;
- files::ScopedTempDir database_path_;
private:
sys::testing::ServiceDirectoryProvider service_directory_provider_;
@@ -536,7 +539,6 @@
SetUpAgent(
Config{/*crashpad_database=*/
{
- /*path=*/database_path_.path(),
/*max_size_in_kb=*/kMaxTotalReportSizeInKb,
},
/*crash_server=*/
@@ -553,7 +555,6 @@
SetUpFeedbackDataProvider(std::make_unique<StubFeedbackDataProvider>());
SetUpAgent(Config{/*crashpad_database=*/
{
- /*path=*/database_path_.path(),
/*max_size_in_kb=*/kMaxTotalReportSizeInKb,
},
/*crash_server=*/
@@ -644,7 +645,6 @@
NodeMatches(
AllOf(NameMatches(kCrashpadDatabaseKey),
PropertyList(UnorderedElementsAreArray({
- StringIs(kCrashpadDatabasePathKey, database_path_.path()),
UintIs(kCrashpadDatabaseMaxSizeInKbKey, kMaxTotalReportSizeInKb),
})))),
NodeMatches(
diff --git a/src/developer/feedback/crashpad_agent/tests/database_unittest.cc b/src/developer/feedback/crashpad_agent/tests/database_unittest.cc
index d3e8352..d91fb67 100644
--- a/src/developer/feedback/crashpad_agent/tests/database_unittest.cc
+++ b/src/developer/feedback/crashpad_agent/tests/database_unittest.cc
@@ -8,7 +8,6 @@
#include "src/lib/files/directory.h"
#include "src/lib/files/path.h"
-#include "src/lib/files/scoped_temp_dir.h"
#include "src/lib/fsl/vmo/strings.h"
#include "src/lib/fxl/logging.h"
#include "src/lib/fxl/test/test_settings.h"
@@ -31,6 +30,7 @@
constexpr uint64_t kMaxTotalReportsSizeInKb = 1024u;
+constexpr char kCrashpadDatabasePath[] = "/tmp/crashes";
constexpr char kCrashpadAttachmentsDir[] = "attachments";
constexpr char kCrashpadCompletedDir[] = "completed";
constexpr char kCrashpadPendingDir[] = "pending";
@@ -71,15 +71,18 @@
public:
void SetUp() override { SetUpDatabase(/*max_size_in_kb=*/kMaxTotalReportsSizeInKb); }
+ void TearDown() override {
+ ASSERT_TRUE(files::DeletePath(kCrashpadDatabasePath, /*recursive=*/true));
+ }
+
protected:
void SetUpDatabase(const uint64_t max_size_in_kb) {
- auto new_database =
- Database::TryCreate(CrashpadDatabaseConfig{database_path_.path(), max_size_in_kb});
+ auto new_database = Database::TryCreate(CrashpadDatabaseConfig{max_size_in_kb});
FXL_CHECK(new_database) << "Error creating database";
database_ = std::move(new_database);
- attachments_dir_ = files::JoinPath(database_path_.path(), kCrashpadAttachmentsDir);
- completed_dir_ = files::JoinPath(database_path_.path(), kCrashpadCompletedDir);
- pending_dir_ = files::JoinPath(database_path_.path(), kCrashpadPendingDir);
+ attachments_dir_ = files::JoinPath(kCrashpadDatabasePath, kCrashpadAttachmentsDir);
+ completed_dir_ = files::JoinPath(kCrashpadDatabasePath, kCrashpadCompletedDir);
+ pending_dir_ = files::JoinPath(kCrashpadDatabasePath, kCrashpadPendingDir);
}
std::vector<std::string> GetAttachmentsDirContents() {
@@ -145,7 +148,6 @@
}
protected:
- files::ScopedTempDir database_path_;
std::unique_ptr<Database> database_;
std::string attachments_dir_;
diff --git a/src/developer/feedback/crashpad_agent/tests/inspect_manager_unittest.cc b/src/developer/feedback/crashpad_agent/tests/inspect_manager_unittest.cc
index 7cb7019..47c5d77 100644
--- a/src/developer/feedback/crashpad_agent/tests/inspect_manager_unittest.cc
+++ b/src/developer/feedback/crashpad_agent/tests/inspect_manager_unittest.cc
@@ -195,7 +195,6 @@
inspect_manager_->ExposeConfig(Config{
/*crashpad_database=*/
{
- /*path=*/"/foo/crashes",
/*max_size_in_kb=*/1234,
},
/*crash_server=*/
@@ -210,7 +209,6 @@
ChildrenMatch(UnorderedElementsAreArray({
NodeMatches(AllOf(NameMatches(kCrashpadDatabaseKey),
PropertyList(UnorderedElementsAreArray({
- StringIs(kCrashpadDatabasePathKey, "/foo/crashes"),
UintIs(kCrashpadDatabaseMaxSizeInKbKey, 1234),
})))),
NodeMatches(AllOf(NameMatches(kCrashServerKey),
@@ -224,7 +222,6 @@
TEST_F(InspectManagerTest, ExposeConfig_UploadDisabled) {
inspect_manager_->ExposeConfig(Config{/*crashpad_database=*/
{
- /*path=*/"/foo/crashes",
/*max_size_in_kb=*/1234,
},
/*crash_server=*/
@@ -239,7 +236,6 @@
ChildrenMatch(UnorderedElementsAreArray({
NodeMatches(AllOf(NameMatches(kCrashpadDatabaseKey),
PropertyList(UnorderedElementsAreArray({
- StringIs(kCrashpadDatabasePathKey, "/foo/crashes"),
UintIs(kCrashpadDatabaseMaxSizeInKbKey, 1234),
})))),
NodeMatches(AllOf(NameMatches(kCrashServerKey),
@@ -251,7 +247,6 @@
TEST_F(InspectManagerTest, ExposeConfig_UploadReadFromPrivacySettings) {
inspect_manager_->ExposeConfig(Config{/*crashpad_database=*/
{
- /*path=*/"/foo/crashes",
/*max_size_in_kb=*/1234,
},
/*crash_server=*/
@@ -266,7 +261,6 @@
ChildrenMatch(UnorderedElementsAreArray({
NodeMatches(AllOf(NameMatches(kCrashpadDatabaseKey),
PropertyList(UnorderedElementsAreArray({
- StringIs(kCrashpadDatabasePathKey, "/foo/crashes"),
UintIs(kCrashpadDatabaseMaxSizeInKbKey, 1234),
})))),
NodeMatches(AllOf(
