Fix wording to comply with respectful-code
https://source.android.com/setup/contribute/respectful-code
Test: Run unit tests
Change-Id: Ia6647c9cf3224b962286151932118093b9ad979a
diff --git a/boot_control_chromeos.h b/boot_control_chromeos.h
index f90e65b..4271672 100644
--- a/boot_control_chromeos.h
+++ b/boot_control_chromeos.h
@@ -82,7 +82,7 @@
// Extracts DLC module ID and package ID from partition name. The structure of
// the partition name is dlc/<dlc-id>/<dlc-package>. For example:
- // dlc/dummy-dlc/dummy-package
+ // dlc/fake-dlc/fake-package
bool ParseDlcPartitionName(const std::string partition_name,
std::string* dlc_id,
std::string* dlc_package) const;
diff --git a/hardware_chromeos.cc b/hardware_chromeos.cc
index 5ff1b29..3adef98 100644
--- a/hardware_chromeos.cc
+++ b/hardware_chromeos.cc
@@ -47,7 +47,7 @@
const char kOOBECompletedMarker[] = "/home/chronos/.oobe_completed";
// The stateful directory used by update_engine to store powerwash-safe files.
-// The files stored here must be whitelisted in the powerwash scripts.
+// The files stored here must be safelisted in the powerwash scripts.
const char kPowerwashSafeDirectory[] =
"/mnt/stateful_partition/unencrypted/preserve";
diff --git a/omaha_request_action.cc b/omaha_request_action.cc
index 3a0b91c..e37ebab 100644
--- a/omaha_request_action.cc
+++ b/omaha_request_action.cc
@@ -351,7 +351,7 @@
// If we have the value stored on disk, just return it.
int64_t stored_value;
if (prefs->GetInt64(kPrefsInstallDateDays, &stored_value)) {
- // Convert and sanity-check.
+ // Convert and validity-check.
int install_date_days = static_cast<int>(stored_value);
if (install_date_days >= 0)
return install_date_days;
diff --git a/omaha_request_builder_xml.cc b/omaha_request_builder_xml.cc
index 097b9f1..e2857f1 100644
--- a/omaha_request_builder_xml.cc
+++ b/omaha_request_builder_xml.cc
@@ -216,7 +216,7 @@
if (!prefs_->GetString(prefs_key, &cohort_value) || cohort_value.empty())
return "";
}
- // This is a sanity check to avoid sending a huge XML file back to Ohama due
+ // This is a validity check to avoid sending a huge XML file back to Ohama due
// to a compromised stateful partition making the update check fail in low
// network environments envent after a reboot.
if (cohort_value.size() > 1024) {
diff --git a/omaha_request_params.h b/omaha_request_params.h
index 3452965..727c2ad 100644
--- a/omaha_request_params.h
+++ b/omaha_request_params.h
@@ -328,7 +328,7 @@
bool ToMoreStableChannel() const;
// Returns True if we should store the fw/ec versions based on our hwid_.
- // Compares hwid to a set of whitelisted prefixes.
+ // Compares hwid to a set of safelisted prefixes.
bool CollectECFWVersions() const;
// Gets the machine type (e.g. "i686").
diff --git a/payload_state.h b/payload_state.h
index d13c642..90c3b13 100644
--- a/payload_state.h
+++ b/payload_state.h
@@ -366,14 +366,14 @@
// check where policy was available. This info is preserved over powerwash.
void LoadRollbackHappened();
- // Loads the blacklisted version from our prefs file.
+ // Loads the blocklisted version from our prefs file.
void LoadRollbackVersion();
// Blacklists this version from getting AU'd to until we receive a new update
// response.
void SetRollbackVersion(const std::string& rollback_version);
- // Clears any blacklisted version.
+ // Clears any blocklisted version.
void ResetRollbackVersion();
inline uint32_t GetUrlIndex() {
@@ -565,7 +565,7 @@
// forced updates to avoid update-rollback loops.
bool rollback_happened_;
- // This stores a blacklisted version set as part of rollback. When we rollback
+ // This stores a blocklisted version set as part of rollback. When we rollback
// we store the version of the os from which we are rolling back from in order
// to guarantee that we do not re-update to it on the next au attempt after
// reboot.
diff --git a/payload_state_unittest.cc b/payload_state_unittest.cc
index bf9aed4..d8d9afa 100644
--- a/payload_state_unittest.cc
+++ b/payload_state_unittest.cc
@@ -1016,7 +1016,7 @@
NiceMock<MockPrefs>* mock_powerwash_safe_prefs =
fake_system_state.mock_powerwash_safe_prefs();
- // Mock out the os version and make sure it's blacklisted correctly.
+ // Mock out the os version and make sure it's blocklisted correctly.
string rollback_version = "2345.0.0";
OmahaRequestParams params(&fake_system_state);
params.Init(rollback_version, "", false);