BASELINE: Update Chromium to 68.0.3440.125

Change-Id: I23f19369e01f688e496f5bf179abb521ad73874f
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 11 insertions, 9 deletions

diff --git a/chromium/services/audio/debug_recording.h b/chromium/services/audio/debug_recording.h
index e0ad38cc806..d5d83f2d7f6 100644
--- a/chromium/services/audio/debug_recording.h
+++ b/chromium/services/audio/debug_recording.h
@@ -5,31 +5,28 @@
 #ifndef SERVICES_AUDIO_DEBUG_RECORDING_H_
 #define SERVICES_AUDIO_DEBUG_RECORDING_H_
 
+#include <memory>
 #include <utility>
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/audio/public/mojom/debug_recording.mojom.h"
+#include "services/audio/traced_service_ref.h"
 
 namespace media {
 class AudioManager;
 enum class AudioDebugRecordingStreamType;
 }
 
-namespace service_manager {
-class ServiceContextRef;
-}
-
 namespace audio {
 
 // Implementation for controlling audio debug recording.
 class DebugRecording : public mojom::DebugRecording {
  public:
-  DebugRecording(
-      mojom::DebugRecordingRequest request,
-      media::AudioManager* audio_manager,
-      std::unique_ptr<service_manager::ServiceContextRef> service_ref);
+  DebugRecording(mojom::DebugRecordingRequest request,
+                 media::AudioManager* audio_manager,
+                 TracedServiceRef service_ref);
 
   // Disables audio debug recording if Enable() was called before.
   ~DebugRecording() override;
@@ -37,6 +34,11 @@ class DebugRecording : public mojom::DebugRecording {
   // Enables audio debug recording.
   void Enable(mojom::DebugRecordingFileProviderPtr file_provider) override;
 
+  // Releases and returns service ref. Used when creating a new debug recording
+  // session while there is an ongoing debug recording session. Ref is
+  // transfered to the latest debug recording session.
+  TracedServiceRef ReleaseServiceRef();
+
  private:
   FRIEND_TEST_ALL_PREFIXES(DebugRecordingTest,
                            CreateWavFileCallsFileProviderCreateWavFile);
@@ -52,7 +54,7 @@ class DebugRecording : public mojom::DebugRecording {
   media::AudioManager* const audio_manager_;
   mojo::Binding<mojom::DebugRecording> binding_;
   mojom::DebugRecordingFileProviderPtr file_provider_;
-  std::unique_ptr<service_manager::ServiceContextRef> service_ref_;
+  TracedServiceRef service_ref_;
 
   base::WeakPtrFactory<DebugRecording> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(DebugRecording);