| Index: chromecast/browser/metrics/cast_metrics_service_client.cc
|
| diff --git a/chromecast/browser/metrics/cast_metrics_service_client.cc b/chromecast/browser/metrics/cast_metrics_service_client.cc
|
| index a2cef3b3c407600b11448ffa87bc67ecc2d4b882..d3739c24f9d27801c6c908bcbbcc9723fb14852c 100644
|
| --- a/chromecast/browser/metrics/cast_metrics_service_client.cc
|
| +++ b/chromecast/browser/metrics/cast_metrics_service_client.cc
|
| @@ -138,7 +138,7 @@ scoped_ptr< ::metrics::ClientInfo> CastMetricsServiceClient::LoadClientInfo() {
|
| // Force old client id to be regenerated. See b/9487011.
|
| client_info->client_id = base::GenerateGUID();
|
| pref_service_->SetBoolean(prefs::kMetricsIsNewClientID, true);
|
| - return client_info.Pass();
|
| + return client_info;
|
| }
|
| // else the device was just FDR'ed, pass through.
|
| }
|
| @@ -146,7 +146,7 @@ scoped_ptr< ::metrics::ClientInfo> CastMetricsServiceClient::LoadClientInfo() {
|
| // Use "forced" client ID if available.
|
| if (!force_client_id_.empty() && base::IsValidGUID(force_client_id_)) {
|
| client_info->client_id = force_client_id_;
|
| - return client_info.Pass();
|
| + return client_info;
|
| }
|
|
|
| if (force_client_id_.empty()) {
|
|
|