Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

8 files changed, 15 insertions, 4 deletions

diff --git a/chromium/ppapi/examples/2d/paint_manager_example.cc b/chromium/ppapi/examples/2d/paint_manager_example.cc
index 86bdbe79ed8..c8d6a798ecd 100644
--- a/chromium/ppapi/examples/2d/paint_manager_example.cc
+++ b/chromium/ppapi/examples/2d/paint_manager_example.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
+
 #include "ppapi/c/pp_input_event.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
diff --git a/chromium/ppapi/examples/2d/scroll.cc b/chromium/ppapi/examples/2d/scroll.cc
index 5dffa5749b7..506129c4929 100644
--- a/chromium/ppapi/examples/2d/scroll.cc
+++ b/chromium/ppapi/examples/2d/scroll.cc
@@ -4,6 +4,8 @@
 
 #include <math.h>
 
+#include <algorithm>
+
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/instance.h"
diff --git a/chromium/ppapi/examples/crxfs/crxfs.cc b/chromium/ppapi/examples/crxfs/crxfs.cc
index 5e4b422cd30..86a212b9823 100644
--- a/chromium/ppapi/examples/crxfs/crxfs.cc
+++ b/chromium/ppapi/examples/crxfs/crxfs.cc
@@ -9,7 +9,7 @@
 #include "ppapi/cpp/file_ref.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
-#include "ppapi/cpp/private/ext_crx_file_system_private.h"
+#include "ppapi/cpp/private/isolated_file_system_private.h"
 #include "ppapi/utility/completion_callback_factory.h"
 
 // When compiling natively on Windows, PostMessage can be #define-d to
@@ -48,7 +48,7 @@ class MyInstance : public pp::Instance {
   pp::CompletionCallbackFactory<MyInstance> factory_;
 
   pp::InstanceHandle handle_;
-  pp::ExtCrxFileSystemPrivate crxfs_;
+  pp::IsolatedFileSystemPrivate crxfs_;
   pp::FileRef file_ref_;
   pp::FileIO file_io_;
   std::string filename_;
@@ -70,7 +70,8 @@ void MyInstance::OpenCrxFsAndReadFile(const std::string& filename) {
   pp::CompletionCallbackWithOutput<pp::FileSystem> callback =
       factory_.NewCallbackWithOutput(&MyInstance::CrxFileSystemCallback);
 
-  crxfs_ = pp::ExtCrxFileSystemPrivate(this);
+  crxfs_ = pp::IsolatedFileSystemPrivate(
+      this, PP_ISOLATEDFILESYSTEMTYPE_PRIVATE_CRX);
   int32_t rv = crxfs_.Open(callback);
   if (rv != PP_OK_COMPLETIONPENDING)
     ReportResponse("ExtCrxFileSystemPrivate::Open", rv);
diff --git a/chromium/ppapi/examples/gamepad/gamepad.cc b/chromium/ppapi/examples/gamepad/gamepad.cc
index e4a9f9fbcf4..a94ccd43c1b 100644
--- a/chromium/ppapi/examples/gamepad/gamepad.cc
+++ b/chromium/ppapi/examples/gamepad/gamepad.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
 #include <cmath>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/chromium/ppapi/examples/ime/ime.cc b/chromium/ppapi/examples/ime/ime.cc
index 0f3e41edcf2..26c2f4225a9 100644
--- a/chromium/ppapi/examples/ime/ime.cc
+++ b/chromium/ppapi/examples/ime/ime.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/chromium/ppapi/examples/input/pointer_event_input.cc b/chromium/ppapi/examples/input/pointer_event_input.cc
index 57c3d313046..3cd76b38a41 100644
--- a/chromium/ppapi/examples/input/pointer_event_input.cc
+++ b/chromium/ppapi/examples/input/pointer_event_input.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
+
 #include "ppapi/c/pp_input_event.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
diff --git a/chromium/ppapi/examples/mouse_cursor/mouse_cursor.cc b/chromium/ppapi/examples/mouse_cursor/mouse_cursor.cc
index 8a70b158a9c..e922fa0b3aa 100644
--- a/chromium/ppapi/examples/mouse_cursor/mouse_cursor.cc
+++ b/chromium/ppapi/examples/mouse_cursor/mouse_cursor.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <algorithm>
+
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/input_event.h"
diff --git a/chromium/ppapi/examples/url_loader/url_loader.html b/chromium/ppapi/examples/url_loader/url_loader.html
index 39f44949734..808b369479b 100644
--- a/chromium/ppapi/examples/url_loader/url_loader.html
+++ b/chromium/ppapi/examples/url_loader/url_loader.html
@@ -39,7 +39,7 @@
   <script>
 
   function HandleMessage(message_event) {
-    document.getElementById("log_result").innerHTML = message_event.data;
+    document.getElementById("log_result").textContent = message_event.data;
   }
 
   // Attach a listener for the message event. This must happen after the plugin