Remove old PersistedLogs prefs.
Also, fixes a few style nits in metrics code.
BUG=404805
Review URL: https://codereview.chromium.org/476343002
Cr-Commit-Position: refs/heads/master@{#290588}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290588 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/components/metrics/persisted_logs.h b/components/metrics/persisted_logs.h
index 7aadfa7..1fb99c69 100644
--- a/components/metrics/persisted_logs.h
+++ b/components/metrics/persisted_logs.h
@@ -38,7 +38,7 @@
};
// Constructs a PersistedLogs that stores data in |local_state| under the
- // preference |pref_name| and also reads from legacy pref |old_pref_name|.
+ // preference |pref_name|.
// Calling code is responsible for ensuring that the lifetime of |local_state|
// is longer than the lifetime of PersistedLogs.
//
@@ -49,7 +49,6 @@
// that limit will be skipped when writing to disk.
PersistedLogs(PrefService* local_state,
const char* pref_name,
- const char* old_pref_name,
size_t min_log_count,
size_t min_log_bytes,
size_t max_log_size);
@@ -72,7 +71,7 @@
void DiscardStagedLog();
// True if a log has been staged.
- bool has_staged_log() const { return staged_log_index_ != -1; };
+ bool has_staged_log() const { return staged_log_index_ != -1; }
// Returns the element in the front of the list.
const std::string& staged_log() const {
@@ -99,10 +98,6 @@
// Reads the list from the ListValue.
LogReadStatus ReadLogsFromPrefList(const base::ListValue& list);
- // Reads the list from the old pref's ListValue.
- // TODO(asvitkine): Remove the old pref in M39.
- LogReadStatus ReadLogsFromOldPrefList(const base::ListValue& list);
-
// A weak pointer to the PrefService object to read and write the preference
// from. Calling code should ensure this object continues to exist for the
// lifetime of the PersistedLogs object.
@@ -111,10 +106,6 @@
// The name of the preference to serialize logs to/from.
const char* pref_name_;
- // The name of the preference to serialize logs from.
- // TODO(asvitkine): Remove the old pref in M39.
- const char* old_pref_name_;
-
// We will keep at least this |min_log_count_| logs or |min_log_bytes_| bytes
// of logs, whichever is greater, when writing to disk. These apply after
// skipping logs greater than |max_log_size_|.