Merge Crashpad to the 42.0.2311 branch

components/metrics/metrics_service.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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It is
@@ skipping 408 matching lines @@
   base::AddActionCallback(action_callback_);
 }
 
 void MetricsService::DisableRecording() {
   DCHECK(IsSingleThreaded());
 
   if (!recording_active_)
     return;
   recording_active_ = false;
 
+  client_->OnRecordingDisabled();
+
   base::RemoveActionCallback(action_callback_);
 
   for (size_t i = 0; i < metrics_providers_.size(); ++i)
     metrics_providers_[i]->OnRecordingDisabled();
 
   PushPendingLogsToPersistentStorage();
 }
 
 bool MetricsService::recording_active() const {
   DCHECK(IsSingleThreaded());
@@ skipping 811 matching lines @@
   local_state_->SetBoolean(path, value);
   RecordCurrentState(local_state_);
 }
 
 void MetricsService::RecordCurrentState(PrefService* pref) {
   pref->SetInt64(prefs::kStabilityLastTimestampSec,
                  base::Time::Now().ToTimeT());
 }
 
 }  // namespace metrics