Merge Crashpad to the 42.0.2311 branch

chromecast/browser/metrics/cast_metrics_service_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/browser/metrics/cast_metrics_service_client.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/i18n/rtl.h"
 #include "base/prefs/pref_service.h"
@@ skipping 30 matching lines @@
                                                       request_context));
 }
 
 void CastMetricsServiceClient::SetMetricsClientId(
     const std::string& client_id) {
   client_id_ = client_id;
   LOG(INFO) << "Metrics client ID set: " << client_id;
   PlatformSetClientID(cast_service_, client_id);
 }
 
+void CastMetricsServiceClient::OnRecordingDisabled() {
+}
+
 void CastMetricsServiceClient::StoreClientInfo(
     const ::metrics::ClientInfo& client_info) {
   const std::string& client_id = client_info.client_id;
   DCHECK(client_id.empty() || base::IsValidGUID(client_id));
   // backup client_id or reset to empty.
   SetMetricsClientId(client_id);
 }
 
 scoped_ptr< ::metrics::ClientInfo> CastMetricsServiceClient::LoadClientInfo() {
   scoped_ptr< ::metrics::ClientInfo> client_info(new ::metrics::ClientInfo);
@@ skipping 202 matching lines @@
 #endif  // defined(OS_LINUX)
   metrics_service_->Stop();
 }
 
 bool CastMetricsServiceClient::IsReportingEnabled() {
   return PlatformIsReportingEnabled(cast_service_);
 }
 
 }  // namespace metrics
 }  // namespace chromecast