Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9

20 files changed, 98 insertions, 234 deletions

diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index bd8586fb3c..166dbefd68 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -7,6 +7,7 @@
     # This library should build cleanly with the extra warnings turned on
     # for Chromium.
     'chromium_code': 1,
+    'emma_never_instrument': 1,
   },
   'targets': [
     # The C++ files generated from the cache invalidation protocol buffers.
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index aba9c46639..3f97de96af 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
 Name: libjingle
 URL: http://code.google.com/p/webrtc/
 Version: unknown
-Revision: 4595
+Revision: 4612
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 28e15c9886..5757c4bd44 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -448,6 +448,8 @@
         '<(libjingle_source)/talk/p2p/base/transportchannelimpl.h',
         '<(libjingle_source)/talk/p2p/base/transportchannelproxy.cc',
         '<(libjingle_source)/talk/p2p/base/transportchannelproxy.h',
+        '<(libjingle_source)/talk/p2p/base/transportdescription.cc',
+        '<(libjingle_source)/talk/p2p/base/transportdescription.h',
         '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.cc',
         '<(libjingle_source)/talk/p2p/base/transportdescriptionfactory.h',
         '<(libjingle_source)/talk/p2p/base/turnport.cc',
diff --git a/third_party/libjingle/libjingle.target.darwin-arm.mk b/third_party/libjingle/libjingle.target.darwin-arm.mk
index 84046b658e..856ef553a7 100644
--- a/third_party/libjingle/libjingle.target.darwin-arm.mk
+++ b/third_party/libjingle/libjingle.target.darwin-arm.mk
@@ -111,6 +111,7 @@ LOCAL_SRC_FILES := \
 	third_party/libjingle/source/talk/p2p/base/transport.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannel.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannelproxy.cc \
+	third_party/libjingle/source/talk/p2p/base/transportdescription.cc \
 	third_party/libjingle/source/talk/p2p/base/transportdescriptionfactory.cc \
 	third_party/libjingle/source/talk/p2p/base/turnport.cc \
 	third_party/libjingle/source/talk/p2p/client/basicportallocator.cc \
diff --git a/third_party/libjingle/libjingle.target.darwin-mips.mk b/third_party/libjingle/libjingle.target.darwin-mips.mk
index a90f250fd2..ff3f5c1bd2 100644
--- a/third_party/libjingle/libjingle.target.darwin-mips.mk
+++ b/third_party/libjingle/libjingle.target.darwin-mips.mk
@@ -111,6 +111,7 @@ LOCAL_SRC_FILES := \
 	third_party/libjingle/source/talk/p2p/base/transport.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannel.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannelproxy.cc \
+	third_party/libjingle/source/talk/p2p/base/transportdescription.cc \
 	third_party/libjingle/source/talk/p2p/base/transportdescriptionfactory.cc \
 	third_party/libjingle/source/talk/p2p/base/turnport.cc \
 	third_party/libjingle/source/talk/p2p/client/basicportallocator.cc \
diff --git a/third_party/libjingle/libjingle.target.darwin-x86.mk b/third_party/libjingle/libjingle.target.darwin-x86.mk
index 4f5fd1acf7..9d89602528 100644
--- a/third_party/libjingle/libjingle.target.darwin-x86.mk
+++ b/third_party/libjingle/libjingle.target.darwin-x86.mk
@@ -111,6 +111,7 @@ LOCAL_SRC_FILES := \
 	third_party/libjingle/source/talk/p2p/base/transport.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannel.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannelproxy.cc \
+	third_party/libjingle/source/talk/p2p/base/transportdescription.cc \
 	third_party/libjingle/source/talk/p2p/base/transportdescriptionfactory.cc \
 	third_party/libjingle/source/talk/p2p/base/turnport.cc \
 	third_party/libjingle/source/talk/p2p/client/basicportallocator.cc \
diff --git a/third_party/libjingle/libjingle.target.linux-arm.mk b/third_party/libjingle/libjingle.target.linux-arm.mk
index 84046b658e..856ef553a7 100644
--- a/third_party/libjingle/libjingle.target.linux-arm.mk
+++ b/third_party/libjingle/libjingle.target.linux-arm.mk
@@ -111,6 +111,7 @@ LOCAL_SRC_FILES := \
 	third_party/libjingle/source/talk/p2p/base/transport.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannel.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannelproxy.cc \
+	third_party/libjingle/source/talk/p2p/base/transportdescription.cc \
 	third_party/libjingle/source/talk/p2p/base/transportdescriptionfactory.cc \
 	third_party/libjingle/source/talk/p2p/base/turnport.cc \
 	third_party/libjingle/source/talk/p2p/client/basicportallocator.cc \
diff --git a/third_party/libjingle/libjingle.target.linux-mips.mk b/third_party/libjingle/libjingle.target.linux-mips.mk
index a90f250fd2..ff3f5c1bd2 100644
--- a/third_party/libjingle/libjingle.target.linux-mips.mk
+++ b/third_party/libjingle/libjingle.target.linux-mips.mk
@@ -111,6 +111,7 @@ LOCAL_SRC_FILES := \
 	third_party/libjingle/source/talk/p2p/base/transport.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannel.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannelproxy.cc \
+	third_party/libjingle/source/talk/p2p/base/transportdescription.cc \
 	third_party/libjingle/source/talk/p2p/base/transportdescriptionfactory.cc \
 	third_party/libjingle/source/talk/p2p/base/turnport.cc \
 	third_party/libjingle/source/talk/p2p/client/basicportallocator.cc \
diff --git a/third_party/libjingle/libjingle.target.linux-x86.mk b/third_party/libjingle/libjingle.target.linux-x86.mk
index 4f5fd1acf7..9d89602528 100644
--- a/third_party/libjingle/libjingle.target.linux-x86.mk
+++ b/third_party/libjingle/libjingle.target.linux-x86.mk
@@ -111,6 +111,7 @@ LOCAL_SRC_FILES := \
 	third_party/libjingle/source/talk/p2p/base/transport.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannel.cc \
 	third_party/libjingle/source/talk/p2p/base/transportchannelproxy.cc \
+	third_party/libjingle/source/talk/p2p/base/transportdescription.cc \
 	third_party/libjingle/source/talk/p2p/base/transportdescriptionfactory.cc \
 	third_party/libjingle/source/talk/p2p/base/turnport.cc \
 	third_party/libjingle/source/talk/p2p/client/basicportallocator.cc \
diff --git a/third_party/libusb/README.chromium b/third_party/libusb/README.chromium
index b0e8ada6ad..348d919814 100644
--- a/third_party/libusb/README.chromium
+++ b/third_party/libusb/README.chromium
@@ -15,3 +15,4 @@ Local Modifications:
 - Exposing an API (libusb_interrupt_handle_event) to explicitly interrupt
   libusb_handle_event.
 - windows-build.patch has been applied.
+- darwin-sigfpe.patch has been applied.
diff --git a/third_party/libusb/darwin-sigfpe.patch b/third_party/libusb/darwin-sigfpe.patch
new file mode 100644
index 0000000000..3c74db1857
--- /dev/null
+++ b/third_party/libusb/darwin-sigfpe.patch
@@ -0,0 +1,22 @@
+diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c
+index b0ee5b2..fe40899 100644
+--- a/libusb/os/darwin_usb.c
++++ b/libusb/os/darwin_usb.c
+@@ -1449,8 +1449,14 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) {
+ 
+   cInterface = &priv->interfaces[iface];
+ 
+-  (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
+-                                                 &transferType, &maxPacketSize, &interval);
++  ret = (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
++                                                       &transferType, &maxPacketSize, &interval);
++
++  if (ret) {
++    usbi_err (TRANSFER_CTX (transfer), "bulk transfer failed (dir = %s): %s (code = 0x%08x)", IS_XFERIN(transfer) ? "In" : "Out",
++              darwin_error_str(ret), ret);
++    return darwin_to_libusb (ret);
++  }
+ 
+   if (0 != (transfer->length % maxPacketSize)) {
+     /* do not need a zero packet */
+
diff --git a/third_party/libusb/src/libusb/os/darwin_usb.c b/third_party/libusb/src/libusb/os/darwin_usb.c
index a24558cb59..3f315e84be 100644
--- a/third_party/libusb/src/libusb/os/darwin_usb.c
+++ b/third_party/libusb/src/libusb/os/darwin_usb.c
@@ -1448,8 +1448,14 @@ static int submit_bulk_transfer(struct usbi_transfer *itransfer) {
 
   cInterface = &priv->interfaces[iface];
 
-  (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
-                                                 &transferType, &maxPacketSize, &interval);
+  ret = (*(cInterface->interface))->GetPipeProperties (cInterface->interface, pipeRef, &direction, &number,
+                                                       &transferType, &maxPacketSize, &interval);
+
+  if (ret) {
+    usbi_err (TRANSFER_CTX (transfer), "bulk transfer failed (dir = %s): %s (code = 0x%08x)", IS_XFERIN(transfer) ? "In" : "Out",
+              darwin_error_str(ret), ret);
+    return darwin_to_libusb (ret);
+  }
 
   if (0 != (transfer->length % maxPacketSize)) {
     /* do not need a zero packet */
diff --git a/third_party/mt19937ar/OWNERS b/third_party/mt19937ar/OWNERS
index be8a9f856c..b9e8da980e 100644
--- a/third_party/mt19937ar/OWNERS
+++ b/third_party/mt19937ar/OWNERS
@@ -1 +1 @@
-asvitkine
+asvitkine@chromium.org
diff --git a/third_party/snappy/README.chromium b/third_party/snappy/README.chromium
index 358a5f3742..f7e3742ac6 100644
--- a/third_party/snappy/README.chromium
+++ b/third_party/snappy/README.chromium
@@ -1,7 +1,7 @@
 Name: Snappy: A fast compressor/decompressor
 Short Name: snappy
 URL: http://code.google.com/p/snappy/
-Version: r74
+Version: r80
 License: New BSD
 License File: src/COPYING
 Security Critical: yes
@@ -14,5 +14,4 @@ Local Additions:
   * Suppress clang header-hygiene warning - https://code.google.com/p/snappy/issues/detail?id=70
   * Suppress MSVC signed/unsigned warning - https://code.google.com/p/snappy/issues/detail?id=71
   * Suppress MSVC x64 size_t warnings - https://code.google.com/p/snappy/issues/detail?id=75
-* {mac,linux}/config.h autogenerated configuration script
-* {mac,linux,win}/snappy-stubs-public.h autogenerated public headers
+* {mac,linux,win32}/snappy-stubs-public.h autogenerated public headers
diff --git a/third_party/snappy/linux/config.h b/third_party/snappy/linux/config.h
deleted file mode 100644
index d993481e6a..0000000000
--- a/third_party/snappy/linux/config.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* Define to 1 if the compiler supports __builtin_ctz and friends. */
-#define HAVE_BUILTIN_CTZ 1
-
-/* Define to 1 if the compiler supports __builtin_expect. */
-#define HAVE_BUILTIN_EXPECT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Use the gflags package for command-line parsing. */
-/* #undef HAVE_GFLAGS */
-
-/* Defined when Google Test is available. */
-/* #undef HAVE_GTEST */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `fastlz' library (-lfastlz). */
-/* #undef HAVE_LIBFASTLZ */
-
-/* Define to 1 if you have the `lzf' library (-llzf). */
-/* #undef HAVE_LIBLZF */
-
-/* Define to 1 if you have the `lzo2' library (-llzo2). */
-/* #undef HAVE_LIBLZO2 */
-
-/* Define to 1 if you have the `quicklz' library (-lquicklz). */
-/* #undef HAVE_LIBQUICKLZ */
-
-/* Define to 1 if you have the `z' library (-lz). */
-#define HAVE_LIBZ 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "snappy"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "snappy"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "snappy 1.0.5"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "snappy"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.5"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.0.5"
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
diff --git a/third_party/snappy/linux/snappy-stubs-public.h b/third_party/snappy/linux/snappy-stubs-public.h
index 9ee4ca52b3..1095511069 100644
--- a/third_party/snappy/linux/snappy-stubs-public.h
+++ b/third_party/snappy/linux/snappy-stubs-public.h
@@ -44,9 +44,13 @@
 #include <stddef.h>
 #endif
 
+#if 1
+#include <sys/uio.h>
+#endif
+
 #define SNAPPY_MAJOR 1
-#define SNAPPY_MINOR 0
-#define SNAPPY_PATCHLEVEL 5
+#define SNAPPY_MINOR 1
+#define SNAPPY_PATCHLEVEL 0
 #define SNAPPY_VERSION \
     ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
 
@@ -80,6 +84,15 @@ typedef std::string string;
   TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 
+#if 0
+// Windows does not have an iovec type, yet the concept is universally useful.
+// It is simple to define it ourselves, so we put it inside our own namespace.
+struct iovec {
+	void* iov_base;
+	size_t iov_len;
+};
+#endif
+
 }  // namespace snappy
 
 #endif  // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
diff --git a/third_party/snappy/mac/config.h b/third_party/snappy/mac/config.h
deleted file mode 100644
index d993481e6a..0000000000
--- a/third_party/snappy/mac/config.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-/* Define to 1 if the compiler supports __builtin_ctz and friends. */
-#define HAVE_BUILTIN_CTZ 1
-
-/* Define to 1 if the compiler supports __builtin_expect. */
-#define HAVE_BUILTIN_EXPECT 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Use the gflags package for command-line parsing. */
-/* #undef HAVE_GFLAGS */
-
-/* Defined when Google Test is available. */
-/* #undef HAVE_GTEST */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `fastlz' library (-lfastlz). */
-/* #undef HAVE_LIBFASTLZ */
-
-/* Define to 1 if you have the `lzf' library (-llzf). */
-/* #undef HAVE_LIBLZF */
-
-/* Define to 1 if you have the `lzo2' library (-llzo2). */
-/* #undef HAVE_LIBLZO2 */
-
-/* Define to 1 if you have the `quicklz' library (-lquicklz). */
-/* #undef HAVE_LIBQUICKLZ */
-
-/* Define to 1 if you have the `z' library (-lz). */
-#define HAVE_LIBZ 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "snappy"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "snappy"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "snappy 1.0.5"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "snappy"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.0.5"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.0.5"
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
diff --git a/third_party/snappy/mac/snappy-stubs-public.h b/third_party/snappy/mac/snappy-stubs-public.h
index 9ee4ca52b3..1095511069 100644
--- a/third_party/snappy/mac/snappy-stubs-public.h
+++ b/third_party/snappy/mac/snappy-stubs-public.h
@@ -44,9 +44,13 @@
 #include <stddef.h>
 #endif
 
+#if 1
+#include <sys/uio.h>
+#endif
+
 #define SNAPPY_MAJOR 1
-#define SNAPPY_MINOR 0
-#define SNAPPY_PATCHLEVEL 5
+#define SNAPPY_MINOR 1
+#define SNAPPY_PATCHLEVEL 0
 #define SNAPPY_VERSION \
     ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
 
@@ -80,6 +84,15 @@ typedef std::string string;
   TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 
+#if 0
+// Windows does not have an iovec type, yet the concept is universally useful.
+// It is simple to define it ourselves, so we put it inside our own namespace.
+struct iovec {
+	void* iov_base;
+	size_t iov_len;
+};
+#endif
+
 }  // namespace snappy
 
 #endif  // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
diff --git a/third_party/snappy/win32/snappy-stubs-public.h b/third_party/snappy/win32/snappy-stubs-public.h
index 5b169c1396..3915c65d74 100644
--- a/third_party/snappy/win32/snappy-stubs-public.h
+++ b/third_party/snappy/win32/snappy-stubs-public.h
@@ -44,9 +44,13 @@
 #include <stddef.h>
 #endif
 
+#if 0
+#include <sys/uio.h>
+#endif
+
 #define SNAPPY_MAJOR 1
-#define SNAPPY_MINOR 0
-#define SNAPPY_PATCHLEVEL 5
+#define SNAPPY_MINOR 1
+#define SNAPPY_PATCHLEVEL 0
 #define SNAPPY_VERSION \
     ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
 
@@ -80,6 +84,20 @@ typedef std::string string;
   TypeName(const TypeName&);               \
   void operator=(const TypeName&)
 
+#if 1
+// Windows does not have an iovec type, yet the concept is universally useful.
+// It is simple to define it ourselves, so we put it inside our own namespace.
+struct iovec {
+  void* iov_base;
+  size_t iov_len;
+};
+#endif
+
+// MSVC does not have ssize_t by default; autoconf suggests defining as `int'.
+// Would be in config.h, but Chromium does not use automake/autoconf.
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+
 }  // namespace snappy
 
 #endif  // UTIL_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
diff --git a/third_party/widevine/cdm/widevine_cdm_common.h b/third_party/widevine/cdm/widevine_cdm_common.h
index 7ea705cea3..2b3ef0dbb6 100644
--- a/third_party/widevine/cdm/widevine_cdm_common.h
+++ b/third_party/widevine/cdm/widevine_cdm_common.h
@@ -19,11 +19,11 @@ const char kWidevineCdmDisplayName[] = "Widevine Content Decryption Module";
 // Will be parsed as HTML.
 const char kWidevineCdmDescription[] =
     "Enables Widevine licenses for playback of HTML audio/video content.";
+
 #if defined(ENABLE_PEPPER_CDMS)
 const char kWidevineCdmPluginMimeType[] = "application/x-ppapi-widevine-cdm";
 const char kWidevineCdmPluginMimeTypeDescription[] =
     "Widevine Content Decryption Module";
-#endif
 
 // File name of the CDM on different platforms.
 const char kWidevineCdmFileName[] =
@@ -35,7 +35,6 @@ const char kWidevineCdmFileName[] =
     "libwidevinecdm.so";
 #endif
 
-#if defined(ENABLE_PEPPER_CDMS)
 // File name of the adapter on different platforms.
 const char kWidevineCdmAdapterFileName[] =
 #if defined(OS_MACOSX)
@@ -45,12 +44,12 @@ const char kWidevineCdmAdapterFileName[] =
 #else  // OS_LINUX, etc.
     "libwidevinecdmadapter.so";
 #endif
-#endif  // defined(ENABLE_PEPPER_CDMS)
 
 
-#if defined(ENABLE_PEPPER_CDMS) && (defined(OS_MACOSX) || defined(OS_WIN))
+#if defined(OS_MACOSX) || defined(OS_WIN)
 // CDM is installed by the component installer instead of the Chrome installer.
 #define WIDEVINE_CDM_IS_COMPONENT
-#endif
+#endif  // defined(OS_MACOSX) || defined(OS_WIN)
+#endif  // defined(ENABLE_PEPPER_CDMS)
 
 #endif  // WIDEVINE_CDM_WIDEVINE_CDM_COMMON_H_