Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / chrome_mock_render_thread.cc

diff --git a/src/chrome/renderer/chrome_mock_render_thread.cc b/src/chrome/renderer/chrome_mock_render_thread.cc
index c58d3eb..0cb28ab 100644 (file)
--- a/src/chrome/renderer/chrome_mock_render_thread.cc
+++ b/src/chrome/renderer/chrome_mock_render_thread.cc
@@ -17,7 +17,7 @@
 #if defined(OS_CHROMEOS)
 #include <fcntl.h>
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #endif
 
 #if defined(ENABLE_PRINTING)
@@ -162,7 +162,10 @@ void ChromeMockRenderThread::OnCheckForCancel(int32 preview_ui_id,
 void ChromeMockRenderThread::OnUpdatePrintSettings(
     int document_cookie,
     const base::DictionaryValue& job_settings,
-    PrintMsg_PrintPages_Params* params) {
+    PrintMsg_PrintPages_Params* params,
+    bool* canceled) {
+  if (canceled)
+    *canceled = false;
   // Check and make sure the required settings are all there.
   // We don't actually care about the values.
   std::string dummy_string;