Fix build after 80-merge

Change-Id: Ic29af5a2866e56fee87c34aa8761d3a93d6b76bf
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

5 files changed, 12 insertions, 8 deletions

diff --git a/chromium/media/base/media_log_properties_helper.h b/chromium/media/base/media_log_properties_helper.h
index 95ff70a82be..549b0037da7 100644
--- a/chromium/media/base/media_log_properties_helper.h
+++ b/chromium/media/base/media_log_properties_helper.h
@@ -83,7 +83,7 @@ struct MediaLogPropertyTypeConverter<std::vector<T>> {
 
 // Specializer for sending AudioDecoderConfigs to the media tab in devtools.
 template <>
-struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {
+struct MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {
   static base::Value Convert(const AudioDecoderConfig& value) {
     base::Value result(base::Value::Type::DICTIONARY);
     result.SetStringKey("codec", GetCodecName(value.codec()));
@@ -114,7 +114,7 @@ struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> {
 
 // Specializer for sending VideoDecoderConfigs to the media tab in devtools.
 template <>
-struct internal::MediaLogPropertyTypeConverter<VideoDecoderConfig> {
+struct MediaLogPropertyTypeConverter<VideoDecoderConfig> {
   static base::Value Convert(const VideoDecoderConfig& value) {
     base::Value result(base::Value::Type::DICTIONARY);
     result.SetStringKey("codec", GetCodecName(value.codec()));
diff --git a/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc b/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc
index ee61472b1e6..4d9287ac298 100644
--- a/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc
+++ b/chromium/third_party/blink/renderer/controller/memory_usage_monitor.cc
@@ -4,7 +4,7 @@
 
 #include "third_party/blink/renderer/controller/memory_usage_monitor.h"
 
-#include "base/test/test_mock_time_task_runner.h"
+#include "base/sequenced_task_runner.h"
 #include "third_party/blink/renderer/platform/bindings/v8_per_isolate_data.h"
 #include "third_party/blink/renderer/platform/scheduler/public/thread.h"
 #include "third_party/blink/renderer/platform/wtf/allocator/partitions.h"
@@ -20,7 +20,7 @@ MemoryUsageMonitor::MemoryUsageMonitor() {
 }
 
 MemoryUsageMonitor::MemoryUsageMonitor(
-    scoped_refptr<base::TestMockTimeTaskRunner> task_runner_for_testing,
+    scoped_refptr<base::SequencedTaskRunner> task_runner_for_testing,
     const base::TickClock* clock_for_testing)
     : timer_(clock_for_testing) {
   timer_.SetTaskRunner(task_runner_for_testing);
diff --git a/chromium/third_party/blink/renderer/controller/memory_usage_monitor.h b/chromium/third_party/blink/renderer/controller/memory_usage_monitor.h
index 80fbcca9bcc..ae0a15284aa 100644
--- a/chromium/third_party/blink/renderer/controller/memory_usage_monitor.h
+++ b/chromium/third_party/blink/renderer/controller/memory_usage_monitor.h
@@ -12,7 +12,7 @@
 #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h"
 
 namespace base {
-class TestMockTimeTaskRunner;
+class SequencedTaskRunner;
 class TickClock;
 }  // namespace base
 
@@ -59,7 +59,7 @@ class CONTROLLER_EXPORT MemoryUsageMonitor {
 
  protected:
   MemoryUsageMonitor(
-      scoped_refptr<base::TestMockTimeTaskRunner> task_runner_for_testing,
+      scoped_refptr<base::SequencedTaskRunner> task_runner_for_testing,
       const base::TickClock* clock_for_testing);
 
   // Adds V8 related memory usage data to the given struct.
diff --git a/chromium/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc b/chromium/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
index 9425c9c546e..a5a7eb66390 100644
--- a/chromium/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
+++ b/chromium/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc
@@ -253,9 +253,9 @@ void DeleteSelectionCommand::InitializePositionData(
   end_root_ = RootEditableElementOf(end);
 
   start_table_row_ = To<HTMLTableRowElement>(
-      EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>));
+      EnclosingNodeOfType(start, &IsA<HTMLTableRowElement, Node>));
   end_table_row_ = To<HTMLTableRowElement>(
-      EnclosingNodeOfType(end, &IsA<HTMLTableRowElement>));
+      EnclosingNodeOfType(end, &IsA<HTMLTableRowElement, Node>));
 
   // Don't move content out of a table cell.
   // If the cell is non-editable, enclosingNodeOfType won't return it by
diff --git a/chromium/third_party/blink/renderer/platform/heap/finalizer_traits.h b/chromium/third_party/blink/renderer/platform/heap/finalizer_traits.h
index 03ff1d959fb..f747b4be40b 100644
--- a/chromium/third_party/blink/renderer/platform/heap/finalizer_traits.h
+++ b/chromium/third_party/blink/renderer/platform/heap/finalizer_traits.h
@@ -49,10 +49,14 @@ struct FinalizerTraitImpl<T, true> {
 // an object's base class has a virtual destructor. In case there is no virtual
 // destructor present, the object is always finalized through its leaf type. In
 // other words: there is no finalization through a base pointer.
+#if defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdelete-non-abstract-non-virtual-dtor"
+#endif
       static_cast<T*>(obj)->~T();
+#if defined(__clang__)
 #pragma GCC diagnostic pop
+#endif
     }
   };
   using FinalizeImpl =