Basic adaptation to Chromium 49

Converts types, callbacks and headers to match Chromium 49.

Task-number: QTBUG-51173
Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/core/print_view_manager_qt.cpp b/src/core/print_view_manager_qt.cpp
index f9b9c9f29..ab14329ac 100644
--- a/src/core/print_view_manager_qt.cpp
+++ b/src/core/print_view_manager_qt.cpp
@@ -61,7 +61,7 @@ static int request_id = 0;
 static const qreal kMicronsToMillimeter = 1000.0f;
 
 static scoped_refptr<base::RefCountedBytes>
-GetDataFromHandle(base::SharedMemoryHandle handle, uint32 data_size) {
+GetDataFromHandle(base::SharedMemoryHandle handle, uint32_t data_size) {
     scoped_ptr<base::SharedMemory> shared_buf(
                 new base::SharedMemory(handle, true));
 
@@ -103,7 +103,7 @@ static void applyQPageLayoutSettingsToDictionary(const QPageLayout& pageLayout,
     scoped_ptr<base::DictionaryValue> sizeDict(new base::DictionaryValue);
     sizeDict->SetInteger(printing::kSettingMediaSizeWidthMicrons, pageSizeInMilimeter.width() * kMicronsToMillimeter);
     sizeDict->SetInteger(printing::kSettingMediaSizeHeightMicrons, pageSizeInMilimeter.height() * kMicronsToMillimeter);
-    print_settings.Set(printing::kSettingMediaSize, sizeDict.Pass());
+    print_settings.Set(printing::kSettingMediaSize, std::move(sizeDict));
 
     print_settings.SetBoolean(printing::kSettingLandscape, pageLayout.orientation() == QPageLayout::Landscape);