BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/chromium/base/win/event_trace_provider.h b/chromium/base/win/event_trace_provider.h
index 7907347b724..d550dd6894a 100644
--- a/chromium/base/win/event_trace_provider.h
+++ b/chromium/base/win/event_trace_provider.h
@@ -10,9 +10,13 @@
 #include <windows.h>
 #include <wmistr.h>
 #include <evntrace.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#include <limits>
 
 #include "base/base_export.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 namespace base {
 namespace win {
@@ -64,9 +68,9 @@ template <size_t N> class EtwMofEvent: public EtwMofEventBase<N> {
     header.Flags = WNODE_FLAG_TRACED_GUID | WNODE_FLAG_USE_MOF_PTR;
   }
 
-  void SetField(int field, size_t size, const void *data) {
+  void SetField(size_t field, size_t size, const void* data) {
     // DCHECK(field < N);
-    if ((field < N) && (size <= kuint32max)) {
+    if ((field < N) && (size <= std::numeric_limits<uint32_t>::max())) {
       fields[field].DataPtr = reinterpret_cast<ULONG64>(data);
       fields[field].Length = static_cast<ULONG>(size);
     }