Merge Crashpad to the 42.0.2311 branch

components/metrics/test_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 "components/metrics/test_metrics_service_client.h"
 
 #include "base/callback.h"
 #include "components/metrics/metrics_log_uploader.h"
 #include "components/metrics/proto/chrome_user_metrics_extension.pb.h"
 
 namespace metrics {
 
 // static
 const char TestMetricsServiceClient::kBrandForTesting[] = "brand_for_testing";
 
 TestMetricsServiceClient::TestMetricsServiceClient()
     : version_string_("5.0.322.0-64-devel"),
       product_(ChromeUserMetricsExtension::CHROME) {
 }
 
 TestMetricsServiceClient::~TestMetricsServiceClient() {
 }
 
 void TestMetricsServiceClient::SetMetricsClientId(
     const std::string& client_id) {
   client_id_ = client_id;
 }
 
+void TestMetricsServiceClient::OnRecordingDisabled() {
+}
+
 bool TestMetricsServiceClient::IsOffTheRecordSessionActive() {
   return false;
 }
 
 int32_t TestMetricsServiceClient::GetProduct() {
   return product_;
 }
 
 std::string TestMetricsServiceClient::GetApplicationLocale() {
   return "en-US";
@@ skipping 24 matching lines @@
     const base::Closure& done_callback) {
   done_callback.Run();
 }
 
 scoped_ptr<MetricsLogUploader> TestMetricsServiceClient::CreateUploader(
     const base::Callback<void(int)>& on_upload_complete) {
   return scoped_ptr<MetricsLogUploader>();
 }
 
 }  // namespace metrics