BASELINE: Update Chromium to 68.0.3440.125

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

5 files changed, 3 insertions, 14 deletions

diff --git a/chromium/device/base/features.cc b/chromium/device/base/features.cc
index 0cb9b248adb..b38d28dbae4 100644
--- a/chromium/device/base/features.cc
+++ b/chromium/device/base/features.cc
@@ -11,6 +11,8 @@ namespace device {
 #if defined(OS_WIN)
 const base::Feature kNewUsbBackend{"NewUsbBackend",
                                    base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kNewBLEWinImplementation{"NewBLEWinImplementation",
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
 #endif  // defined(OS_WIN)
 
 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git a/chromium/device/base/features.h b/chromium/device/base/features.h
index 062f03f2494..c25697a021e 100644
--- a/chromium/device/base/features.h
+++ b/chromium/device/base/features.h
@@ -13,6 +13,7 @@ namespace device {
 
 #if defined(OS_WIN)
 DEVICE_BASE_EXPORT extern const base::Feature kNewUsbBackend;
+DEVICE_BASE_EXPORT extern const base::Feature kNewBLEWinImplementation;
 #endif  // defined(OS_WIN)
 
 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
diff --git a/chromium/device/base/synchronization/one_writer_seqlock.cc b/chromium/device/base/synchronization/one_writer_seqlock.cc
index b0eb3810dd4..7b855cfd1cb 100644
--- a/chromium/device/base/synchronization/one_writer_seqlock.cc
+++ b/chromium/device/base/synchronization/one_writer_seqlock.cc
@@ -24,17 +24,6 @@ base::subtle::Atomic32 OneWriterSeqLock::ReadBegin() const {
   return version;
 }
 
-void OneWriterSeqLock::TryRead(bool* can_read,
-                               base::subtle::Atomic32* version) const {
-  DCHECK(can_read);
-  DCHECK(version);
-
-  *version = base::subtle::NoBarrier_Load(&sequence_);
-  // If the counter is even, then the associated data might be in a
-  // consistent state, so we can try to read.
-  *can_read = (*version & 1) == 0;
-}
-
 bool OneWriterSeqLock::ReadRetry(base::subtle::Atomic32 version) const {
   // If the sequence number was updated then a read should be re-attempted.
   // -- Load fence, read membarrier
diff --git a/chromium/device/base/synchronization/one_writer_seqlock.h b/chromium/device/base/synchronization/one_writer_seqlock.h
index 7be84056015..867fb82ba7a 100644
--- a/chromium/device/base/synchronization/one_writer_seqlock.h
+++ b/chromium/device/base/synchronization/one_writer_seqlock.h
@@ -32,7 +32,6 @@ class OneWriterSeqLock {
  public:
   OneWriterSeqLock();
   base::subtle::Atomic32 ReadBegin() const;
-  void TryRead(bool* can_read, base::subtle::Atomic32* version) const;
   bool ReadRetry(base::subtle::Atomic32 version) const;
   void WriteBegin();
   void WriteEnd();
diff --git a/chromium/device/base/synchronization/shared_memory_seqlock_buffer.h b/chromium/device/base/synchronization/shared_memory_seqlock_buffer.h
index 1ad5a8a6a60..4835b097bc1 100644
--- a/chromium/device/base/synchronization/shared_memory_seqlock_buffer.h
+++ b/chromium/device/base/synchronization/shared_memory_seqlock_buffer.h
@@ -21,8 +21,6 @@ namespace device {
 template <class Data>
 class SharedMemorySeqLockBuffer {
  public:
-  SharedMemorySeqLockBuffer() {}
-  explicit SharedMemorySeqLockBuffer(const Data& data) : data(data) {}
   OneWriterSeqLock seqlock;
   Data data;
 };