BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

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

7 files changed, 25 insertions, 21 deletions

diff --git a/chromium/ui/gfx/android/OWNERS b/chromium/ui/gfx/android/OWNERS
index 316565b6ed3..184905015a9 100644
--- a/chromium/ui/gfx/android/OWNERS
+++ b/chromium/ui/gfx/android/OWNERS
@@ -1,3 +1,2 @@
 aelias@chromium.org
-jdduke@chromium.org
 skyostil@chromium.org
diff --git a/chromium/ui/gfx/android/device_display_info.cc b/chromium/ui/gfx/android/device_display_info.cc
index 4d2c80c09d6..5611a7476b3 100644
--- a/chromium/ui/gfx/android/device_display_info.cc
+++ b/chromium/ui/gfx/android/device_display_info.cc
@@ -15,39 +15,39 @@ DeviceDisplayInfo::DeviceDisplayInfo() {
 DeviceDisplayInfo::~DeviceDisplayInfo() {
 }
 
-int DeviceDisplayInfo::GetDisplayHeight() {
+int DeviceDisplayInfo::GetDisplayHeight() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetDisplayHeight();
 }
 
-int DeviceDisplayInfo::GetDisplayWidth() {
+int DeviceDisplayInfo::GetDisplayWidth() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetDisplayWidth();
 }
 
-int DeviceDisplayInfo::GetPhysicalDisplayHeight() {
+int DeviceDisplayInfo::GetPhysicalDisplayHeight() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetPhysicalDisplayHeight();
 }
 
-int DeviceDisplayInfo::GetPhysicalDisplayWidth() {
+int DeviceDisplayInfo::GetPhysicalDisplayWidth() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetPhysicalDisplayWidth();
 }
 
-int DeviceDisplayInfo::GetBitsPerPixel() {
+int DeviceDisplayInfo::GetBitsPerPixel() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetBitsPerPixel();
 }
 
-int DeviceDisplayInfo::GetBitsPerComponent() {
+int DeviceDisplayInfo::GetBitsPerComponent() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetBitsPerComponent();
 }
 
-double DeviceDisplayInfo::GetDIPScale() {
+double DeviceDisplayInfo::GetDIPScale() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetDIPScale();
 }
 
-int DeviceDisplayInfo::GetSmallestDIPWidth() {
+int DeviceDisplayInfo::GetSmallestDIPWidth() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetSmallestDIPWidth();
 }
 
-int DeviceDisplayInfo::GetRotationDegrees() {
+int DeviceDisplayInfo::GetRotationDegrees() const {
   return SharedDeviceDisplayInfo::GetInstance()->GetRotationDegrees();
 }
 
diff --git a/chromium/ui/gfx/android/device_display_info.h b/chromium/ui/gfx/android/device_display_info.h
index 74e0ada4875..bf717dcdb36 100644
--- a/chromium/ui/gfx/android/device_display_info.h
+++ b/chromium/ui/gfx/android/device_display_info.h
@@ -8,7 +8,7 @@
 #include <jni.h>
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/gfx/gfx_export.h"
 
 namespace gfx {
@@ -21,40 +21,40 @@ class GFX_EXPORT DeviceDisplayInfo {
   ~DeviceDisplayInfo();
 
   // Returns display height in physical pixels.
-  int GetDisplayHeight();
+  int GetDisplayHeight() const;
 
   // Returns display width in physical pixels.
-  int GetDisplayWidth();
+  int GetDisplayWidth() const;
 
   // Returns real display height in physical pixels.
   // This version does not subtract window decorations etc.
   // WARNING: This is only supported on JB-MR1 (sdk >= 17). Either
   //          check the SDK-level, or check for '0' being returned.
-  int GetPhysicalDisplayHeight();
+  int GetPhysicalDisplayHeight() const;
 
   // Returns real display width in physical pixels.
   // This version does not subtract window decorations etc.
   // WARNING: This is only supported on JB-MR1 (sdk >= 17). Either
   //          check the SDK-level, or check for '0' being returned.
-  int GetPhysicalDisplayWidth();
+  int GetPhysicalDisplayWidth() const;
 
   // Returns number of bits per pixel.
-  int GetBitsPerPixel();
+  int GetBitsPerPixel() const;
 
   // Returns number of bits per component.
-  int GetBitsPerComponent();
+  int GetBitsPerComponent() const;
 
   // Returns a scaling factor for Density Independent Pixel unit
   // (1.0 is 160dpi, 0.75 is 120dpi, 2.0 is 320dpi).
-  double GetDIPScale();
+  double GetDIPScale() const;
 
   // Smallest possible screen size in density-independent pixels.
-  int GetSmallestDIPWidth();
+  int GetSmallestDIPWidth() const;
 
   // Returns the display rotation angle from its natural orientation. Expected
   // values are one of { 0, 90, 180, 270 }.
   // See DeviceDispayInfo.java for more information.
-  int GetRotationDegrees();
+  int GetRotationDegrees() const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeviceDisplayInfo);
diff --git a/chromium/ui/gfx/android/java_bitmap.h b/chromium/ui/gfx/android/java_bitmap.h
index 6c615abb4c8..97f85d40730 100644
--- a/chromium/ui/gfx/android/java_bitmap.h
+++ b/chromium/ui/gfx/android/java_bitmap.h
@@ -6,8 +6,10 @@
 #define UI_GFX_ANDROID_JAVA_BITMAP_H_
 
 #include <jni.h>
+#include <stdint.h>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/geometry/size.h"
 
diff --git a/chromium/ui/gfx/android/shared_device_display_info.cc b/chromium/ui/gfx/android/shared_device_display_info.cc
index 5fb9aa1b60d..228626f9dfb 100644
--- a/chromium/ui/gfx/android/shared_device_display_info.cc
+++ b/chromium/ui/gfx/android/shared_device_display_info.cc
@@ -4,6 +4,7 @@
 
 #include "ui/gfx/android/shared_device_display_info.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
diff --git a/chromium/ui/gfx/android/shared_device_display_info.h b/chromium/ui/gfx/android/shared_device_display_info.h
index 0018b3719b4..ec541091554 100644
--- a/chromium/ui/gfx/android/shared_device_display_info.h
+++ b/chromium/ui/gfx/android/shared_device_display_info.h
@@ -6,7 +6,7 @@
 #define UI_GFX_ANDROID_SHARED_DEVICE_DISPLAY_INFO_H_
 
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 
diff --git a/chromium/ui/gfx/android/view_configuration.cc b/chromium/ui/gfx/android/view_configuration.cc
index df9581be135..b30f232c137 100644
--- a/chromium/ui/gfx/android/view_configuration.cc
+++ b/chromium/ui/gfx/android/view_configuration.cc
@@ -4,8 +4,10 @@
 
 #include "ui/gfx/android/view_configuration.h"
 
+#include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/lazy_instance.h"
+#include "base/macros.h"
 #include "base/threading/non_thread_safe.h"
 #include "jni/ViewConfigurationHelper_jni.h"