--- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h

+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h

@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents {

           allocation_length_(0),

           data_(data),

           data_length_(0),

-          kind_(AllocationKind::kNormal),

+          kind_(WTF::ArrayBufferContents::AllocationKind::kNormal),

           deleter_(deleter) {}

     DataHandle(void* allocation_base,

                size_t allocation_length,

@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents {

              reinterpret_cast<uintptr_t>(allocation_base_) +

                  allocation_length_);

       switch (kind_) {

-        case AllocationKind::kNormal:

+        case WTF::ArrayBufferContents::AllocationKind::kNormal:

           DCHECK(deleter_);

           deleter_(data_);

           return;

-        case AllocationKind::kReservation:

+        case WTF::ArrayBufferContents::AllocationKind::kReservation:

           ReleaseReservedMemory(allocation_base_, allocation_length_);

           return;

       }

--- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig	2017-08-15 12:45:59.433532111 +0000

+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc	2017-08-15 17:52:59.691328825 +0000

@@ -10,7 +10,7 @@

 #include "webrtc/modules/audio_processing/aec3/aec_state.h"

-#include <math.h>

+#include <cmath>

 #include <numeric>

 #include <vector>

--- a/gpu/ipc/common/mailbox_struct_traits.h

+++ b/gpu/ipc/common/mailbox_struct_traits.h

@@ -15,7 +15,7 @@ namespace mojo {

 template <>

 struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {

   static base::span<const int8_t> name(const gpu::Mailbox& mailbox) {

-    return mailbox.name;

+    return base::make_span(mailbox.name);

   }

   static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out);

 };

--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h

+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h

@@ -134,7 +134,7 @@ struct StructTraits<viz::mojom::FilterOperationDataView, cc::FilterOperation> {

   static base::span<const float> matrix(const cc::FilterOperation& operation) {

     if (operation.type() != cc::FilterOperation::COLOR_MATRIX)

       return base::span<const float>();

-    return operation.matrix();

+    return base::make_span(operation.matrix());

   }

   static base::span<const gfx::Rect> shape(

--- a/services/viz/public/cpp/compositing/quads_struct_traits.h

+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h

@@ -284,7 +284,7 @@

   static base::span<const float> vertex_opacity(const cc::DrawQuad& input) {

     const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input);

-    return quad->vertex_opacity;

+    return base::make_span(quad->vertex_opacity);

   }

   static bool y_flipped(const cc::DrawQuad& input) {

--- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp

+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp

@@ -480,7 +480,7 @@ WebString AccessControlErrorString(

     }

     default:

       NOTREACHED();

-      return "";

+      return WebString();

   }

 }

@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status,

     }

     default:

       NOTREACHED();

-      return "";

+      return WebString();

   }

 }

@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status,

     }

     default:

       NOTREACHED();

-      return "";

+      return WebString();

   }

 }