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, 3 insertions, 3 deletions

diff --git a/src/core/print_view_manager_base_qt.cpp b/src/core/print_view_manager_base_qt.cpp
index ea6345f94..60f166423 100644
--- a/src/core/print_view_manager_base_qt.cpp
+++ b/src/core/print_view_manager_base_qt.cpp
@@ -289,7 +289,7 @@ void PrintViewManagerBaseQt::OnDidPrintPage(
 #else
   // Update the rendered document. It will send notifications to the listener.
   document->SetPage(params.page_number,
-                    metafile.Pass(),
+                    std::move(metafile),
 #if defined(OS_WIN)
                     1.0f, // shrink factor, needed on windows.
 #endif // defined(OS_WIN)
@@ -477,7 +477,7 @@ bool PrintViewManagerBaseQt::RunInnerMessageLoop() {
   base::OneShotTimer quit_timer;
   quit_timer.Start(FROM_HERE,
                    base::TimeDelta::FromMilliseconds(kPrinterSettingsTimeout),
-                   base::MessageLoop::current(), &base::MessageLoop::Quit);
+                   base::MessageLoop::current(), &base::MessageLoop::QuitWhenIdle);
 
   m_isInsideInnerMessageLoop = true;
 
@@ -512,7 +512,7 @@ void PrintViewManagerBaseQt::ShouldQuitFromInnerMessageLoop()
         m_isInsideInnerMessageLoop) {
       // We are in a message loop created by RenderAllMissingPagesNow. Quit from
       // it.
-      base::MessageLoop::current()->Quit();
+      base::MessageLoop::current()->QuitWhenIdle();
       m_isInsideInnerMessageLoop = false;
     }
 }