Update Chromium snapshot to stable version 33.0.1750.170

This is meant as a baseline commit hence it does not
include the patches we need to apply for QtWebEngine.
All patches should be rebased on top of this commit
so we can get rid of the external patches directory.
In future these baseline commits always have to include
the exact Chromium version returned by version_resolver.py's
currentVersion() in their first line, so that we can
retrieve the patches on top to apply on the upstream
repository. This also includes a ninja update.

Change-Id: I60abeadb785a3b7d149c58b65ddb5a823fed3083
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

9 files changed, 24 insertions, 26 deletions

diff --git a/chromium/base/atomicops_internals_arm_gcc.h b/chromium/base/atomicops_internals_arm_gcc.h
index 1964041b8a7..9f4fe2e586e 100644
--- a/chromium/base/atomicops_internals_arm_gcc.h
+++ b/chromium/base/atomicops_internals_arm_gcc.h
@@ -53,7 +53,7 @@ inline void MemoryBarrier() {
 #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \
     defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \
     defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \
-    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || \
+    defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \
     defined(__ARM_ARCH_6KZ__) || defined(__ARM_ARCH_6T2__)
 
 inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr,
diff --git a/chromium/base/base.gyp b/chromium/base/base.gyp
index b5af9d76e1a..407d49d0582 100644
--- a/chromium/base/base.gyp
+++ b/chromium/base/base.gyp
@@ -35,7 +35,7 @@
         ],
       },
       'conditions': [
-        ['desktop_linux == 1 or chromeos == 1 or qt_os == "embedded_linux"', {
+        ['desktop_linux == 1 or chromeos == 1', {
           'conditions': [
             ['chromeos==1', {
               'sources/': [ ['include', '_chromeos\\.cc$'] ]
diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
index 45d71802744..11edab00968 100644
--- a/chromium/base/base.gypi
+++ b/chromium/base/base.gypi
@@ -722,18 +722,6 @@
                 'atomicops_internals_x86_gcc.cc',
               ],
           }],
-          # We need to include xdg for embedded linux,
-          # but we indeed do not want atomicops for x86.
-          ['qt_os == "embedded_linux"', {
-              'sources/': [
-                ['include', '^nix/'],
-              ],
-          }],
-          ['use_qt==1 and target_arch=="ia32"', {
-              'sources/': [
-                ['include', 'atomicops_internals_x86_gcc.cc'],
-              ],
-          }],
           ['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
               'sources!': [
                 'message_loop/message_pump_glib.cc',
diff --git a/chromium/base/callback_forward.h b/chromium/base/callback_forward.h
index 8538bb2488a..79832481af2 100644
--- a/chromium/base/callback_forward.h
+++ b/chromium/base/callback_forward.h
@@ -5,6 +5,13 @@
 #ifndef BASE_CALLBACK_FORWARD_H_
 #define BASE_CALLBACK_FORWARD_H_
 
-#include "base/callback.h"
+namespace base {
+
+template <typename Sig>
+class Callback;
+
+typedef Callback<void(void)> Closure;
+
+}  // namespace base
 
 #endif  // BASE_CALLBACK_FORWARD_H
diff --git a/chromium/base/message_loop/message_pump_gtk.cc b/chromium/base/message_loop/message_pump_gtk.cc
index 6023c1141ed..86d2415a412 100644
--- a/chromium/base/message_loop/message_pump_gtk.cc
+++ b/chromium/base/message_loop/message_pump_gtk.cc
@@ -79,9 +79,6 @@ void MessagePumpGtk::DispatchEvents(GdkEvent* event) {
   DidProcessEvent(event);
 }
 
-// FIXME: Get our own MessagePumpUI to avoid this.
-// Comment out this version so that our Qt version in shared_globals.cpp is used.
-/*
 // static
 Display* MessagePumpGtk::GetDefaultXDisplay() {
   static GdkDisplay* display = gdk_display_get_default();
@@ -93,7 +90,6 @@ Display* MessagePumpGtk::GetDefaultXDisplay() {
   }
   return GDK_DISPLAY_XDISPLAY(display);
 }
-*/
 
 void MessagePumpGtk::AddObserver(MessagePumpGdkObserver* observer) {
   observers_.AddObserver(observer);
diff --git a/chromium/base/message_loop/message_pump_x11.cc b/chromium/base/message_loop/message_pump_x11.cc
index 001775c5d00..35dcc040348 100644
--- a/chromium/base/message_loop/message_pump_x11.cc
+++ b/chromium/base/message_loop/message_pump_x11.cc
@@ -141,15 +141,12 @@ MessagePumpX11::~MessagePumpX11() {
   g_xdisplay = NULL;
 }
 
-#if !defined(TOOLKIT_QT)
-// Qt uses it's own version.
 // static
 Display* MessagePumpX11::GetDefaultXDisplay() {
   if (!g_xdisplay)
     g_xdisplay = XOpenDisplay(NULL);
   return g_xdisplay;
 }
-#endif
 
 #if defined(TOOLKIT_GTK)
 // static
diff --git a/chromium/base/platform_file_win.cc b/chromium/base/platform_file_win.cc
index 07b5c48c22b..b5e07d7665f 100644
--- a/chromium/base/platform_file_win.cc
+++ b/chromium/base/platform_file_win.cc
@@ -86,6 +86,20 @@ PlatformFile CreatePlatformFileUnsafe(const FilePath& name,
   HANDLE file = CreateFile(name.value().c_str(), access, sharing, NULL,
                            disposition, create_flags, NULL);
 
+  if (INVALID_HANDLE_VALUE != file){
+    // Don't allow directories to be opened without the proper flag (block ADS).
+    if (!(flags & PLATFORM_FILE_BACKUP_SEMANTICS)) {
+      BY_HANDLE_FILE_INFORMATION info = { 0 };
+      BOOL result = GetFileInformationByHandle(file, &info);
+      DCHECK(result);
+      if (info.dwFileAttributes & (FILE_ATTRIBUTE_DIRECTORY |
+                                   FILE_ATTRIBUTE_REPARSE_POINT)) {
+        CloseHandle(file);
+        file = INVALID_HANDLE_VALUE;
+      }
+    }
+  }
+
   if (created && (INVALID_HANDLE_VALUE != file)) {
     if (flags & (PLATFORM_FILE_OPEN_ALWAYS))
       *created = (ERROR_ALREADY_EXISTS != GetLastError());
diff --git a/chromium/base/process/process_iterator_mac.cc b/chromium/base/process/process_iterator_mac.cc
index e35c2ae19ba..29daa2d489f 100644
--- a/chromium/base/process/process_iterator_mac.cc
+++ b/chromium/base/process/process_iterator_mac.cc
@@ -7,7 +7,6 @@
 #include <errno.h>
 #include <sys/sysctl.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include "base/logging.h"
 #include "base/strings/string_util.h"
diff --git a/chromium/base/run_loop.h b/chromium/base/run_loop.h
index 055b1b8146d..0dce6346e76 100644
--- a/chromium/base/run_loop.h
+++ b/chromium/base/run_loop.h
@@ -10,8 +10,6 @@
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 
-class WebEngineContext;
-
 namespace base {
 #if defined(OS_ANDROID)
 class MessagePumpForUI;
@@ -78,7 +76,6 @@ class BASE_EXPORT RunLoop {
 
  private:
   friend class MessageLoop;
-  friend class ::WebEngineContext;
 #if defined(OS_ANDROID)
   // Android doesn't support the blocking MessageLoop::Run, so it calls
   // BeforeRun and AfterRun directly.