Refactor SetClientID such that metrics rather than crash backs up the client id
in Google Update settings.
Consequentially, the backed up client_id now keeps its dashes and crash_keys
strips them at runtime rather than when backing it up
(https://codereview.chromium.org/372473004/ will add support for stripped
client_id backups for some time).
Also rename a lot of methods involved in setting the client id; having all of
them named "SetClientID" makes this series of calls very hard to follow!
BUG=391338
TBR=thestig
Review URL: https://codereview.chromium.org/365133005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282093 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/components/metrics/metrics_service.cc b/components/metrics/metrics_service.cc
index b9d8dbb..797ec70 100644
--- a/components/metrics/metrics_service.cc
+++ b/components/metrics/metrics_service.cc
@@ -404,7 +404,7 @@
recording_active_ = true;
state_manager_->ForceClientIdCreation();
- client_->SetClientID(state_manager_->client_id());
+ client_->SetMetricsClientId(state_manager_->client_id());
if (!log_manager_.current_log())
OpenNewLog();
diff --git a/components/metrics/metrics_service_client.h b/components/metrics/metrics_service_client.h
index 1fcfb6ea..d8e2c158 100644
--- a/components/metrics/metrics_service_client.h
+++ b/components/metrics/metrics_service_client.h
@@ -22,9 +22,9 @@
public:
virtual ~MetricsServiceClient() {}
- // Register the client id with other services (e.g. crash reporting), called
+ // Registers the client id with other services (e.g. crash reporting), called
// when metrics recording gets enabled.
- virtual void SetClientID(const std::string& client_id) = 0;
+ virtual void SetMetricsClientId(const std::string& client_id) = 0;
// Whether there's an "off the record" (aka "Incognito") session active.
virtual bool IsOffTheRecordSessionActive() = 0;
diff --git a/components/metrics/test_metrics_service_client.cc b/components/metrics/test_metrics_service_client.cc
index 4e1a3c3..e5e97780e 100644
--- a/components/metrics/test_metrics_service_client.cc
+++ b/components/metrics/test_metrics_service_client.cc
@@ -19,7 +19,8 @@
TestMetricsServiceClient::~TestMetricsServiceClient() {
}
-void TestMetricsServiceClient::SetClientID(const std::string& client_id) {
+void TestMetricsServiceClient::SetMetricsClientId(
+ const std::string& client_id) {
client_id_ = client_id;
}
diff --git a/components/metrics/test_metrics_service_client.h b/components/metrics/test_metrics_service_client.h
index 0b7bdef..edbee2f 100644
--- a/components/metrics/test_metrics_service_client.h
+++ b/components/metrics/test_metrics_service_client.h
@@ -21,7 +21,7 @@
virtual ~TestMetricsServiceClient();
// MetricsServiceClient:
- virtual void SetClientID(const std::string& client_id) OVERRIDE;
+ virtual void SetMetricsClientId(const std::string& client_id) OVERRIDE;
virtual bool IsOffTheRecordSessionActive() OVERRIDE;
virtual std::string GetApplicationLocale() OVERRIDE;
virtual bool GetBrand(std::string* brand_code) OVERRIDE;
