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>

2 files changed, 93 insertions, 4 deletions

diff --git a/chromium/tools/lsan/PRESUBMIT.py b/chromium/tools/lsan/PRESUBMIT.py
new file mode 100644
index 00000000000..8364d2c0dba
--- /dev/null
+++ b/chromium/tools/lsan/PRESUBMIT.py
@@ -0,0 +1,36 @@
+# Copyright 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts
+for more details on the presubmit API built into gcl.
+"""
+
+import re
+
+def CheckChange(input_api, output_api):
+  errors = []
+
+  for f in input_api.AffectedFiles():
+    if not f.LocalPath().endswith('suppressions.txt'):
+      continue
+    for line_num, line in enumerate(f.NewContents()):
+      line = line.strip()
+      if line.startswith('#') or not line:
+        continue
+      if not line.startswith('leak:'):
+        errors.append('"%s" should be "leak:..." in %s line %d' %
+                      (line, f.LocalPath(), line_num))
+  if errors:
+    return [output_api.PresubmitError('\n'.join(errors))]
+  return []
+
+def CheckChangeOnUpload(input_api, output_api):
+  return CheckChange(input_api, output_api)
+
+def CheckChangeOnCommit(input_api, output_api):
+  return CheckChange(input_api, output_api)
+
+def GetPreferredTrySlaves():
+  return ['linux_asan']
diff --git a/chromium/tools/lsan/suppressions.txt b/chromium/tools/lsan/suppressions.txt
index d38d98125db..a600398f495 100644
--- a/chromium/tools/lsan/suppressions.txt
+++ b/chromium/tools/lsan/suppressions.txt
@@ -1,9 +1,15 @@
 # HeapCheck sanity test
 leak:base::ToolsSanityTest_MemoryLeak_Test::TestBody
 
+#### Third-party leaks ####
+
 # False positives in libfontconfig. http://crbug.com/39050
 leak:libfontconfig
 
+# False positive in Blink due to bit twiddling on pointers. http://crbug.com/242672
+# TODO(earthdok): Annotate.
+leak:WTF::BitVector::resizeOutOfLine
+
 # V8 leak, expect 1024 bytes leaked per process. http://crbug.com/99304
 leak:v8::internal::V8::Initialize
 
@@ -13,6 +19,13 @@ leak:net::(anonymous namespace)::ProxyResolverV8WithMockBindings::SetPacScriptFr
 leak:net::(anonymous namespace)::InitResolver
 leak:net::ProxyResolverScriptData::FromUTF8
 
+# A small string is leaked here (57 bytes per process). http://crbug.com/46571#c9
+leak:WebCore::V8GCController::collectGarbage
+
+# Intentional leak in Blink. http://crbug.com/121729
+# TODO(earthdok): annotate it.
+leak:WebCore::parseUASheet
+
 # http://crbug.com/270180
 leak:net::ProxyResolverV8::Context::ResolveProxy
 
@@ -25,7 +38,8 @@ leak:crypto::ScopedTestNSSDB::ScopedTestNSSDB
 leak:error_get_my_stack
 
 # The NSS suppressions above will not fire when the fast stack unwinder is used,
-# because it can't unwind through NSS libraries. Apply blanket supressions for now.
+# because it can't unwind through NSS libraries. Apply blanket suppressions for
+# now.
 leak:libnssutil3
 leak:libnspr4
 leak:libnss3
@@ -38,6 +52,35 @@ leak:FontConfigTypeface::LegacyCreateTypeface
 # Skia leaks GrGpuGL::ProgramCache::Entry. http://crbug.com/262934
 leak:GrGpuGL::flushGraphicsState
 
+# xrandr leak. http://crbug.com/119677
+leak:XRRFindDisplay
+
+# V8 may leak this by design in unit tests. http://crbug.com/323149
+leak:v8::internal::Genesis::Genesis
+
+# Suppressions for objects which can be owned by the V8 heap. This is a
+# temporary workaround until LeakSanitizer supports the V8 heap.
+# http://crbug.com/328552
+leak:extensions::ObjectBackedNativeHandler::RouteFunction
+leak:toString<WTF::AtomicString>
+leak:WebCore::StringCache::createStringAndInsertIntoCache
+leak:WebCore::V8WindowShell::initializeIfNeeded
+leak:WebCore::V8MouseEvent::constructorCallback
+leak:WebCore::*::*GetterCallback
+leak:WebCore::*::*SetterCallback
+leak:WebCore::*::errorMethodCallback
+leak:WebCore::v8StringToWebCoreString
+leak:WTF::StringImpl::createUninitialized
+leak:ResourceBundleSourceMap::GetSource
+
+# http://crbug.com/328987
+leak:MetricsNetworkObserver::ProbeWifiPHYLayerProtocol
+leak:MetricsLog::MetricsLog
+
+#### Actual bugs in Chromium code ####
+# PLEASE DO NOT ADD NEW SUPPRESSIONS TO THIS SECTION. Instead, commits that
+# introduce memory leaks should be reverted.
+
 # Small test-only leak in ppapi_unittests. http://crbug.com/258113
 leak:ppapi::proxy::PPP_Instance_Private_ProxyTest_PPPInstancePrivate_Test
 
@@ -48,9 +91,11 @@ leak:base::WeakPtrTest_MoveOwnershipAfterInvalidate_Test::TestBody
 leak:gpu::gles2::GLES2DecoderImpl::DoBindRenderbuffer
 leak:gpu::gles2::GLES2DecoderImpl::DoRenderbufferStorage
 
-# Leak in unit_tests. http://crbug.com/282646
-leak:DeclarativeContentActionTest_ShowPageAction_Test::TestBody
-leak:DeclarativeContentRulesRegistryTest_ActiveRulesDoesntGrow_Test::TestBody
+# Leak in cc_unittests. http://crbug.com/317965
+leak:cc::ThreadProxy::ReadyToFinalizeTextureUpdates
+
+# Leak in unit_tests and browser_tests. http://crbug.com/309468
+leak:TranslateBubbleView::CreateViewBeforeTranslate()
 
 # GTK leaks. GTK is deprecated, so we won't be fixing these.
 # Most of them should apply to the full browser process only.
@@ -58,3 +103,11 @@ leak:StatusIconGtk::UpdatePlatformContextMenu
 leak:GlobalMenuBar::GlobalMenuBar
 leak:BookmarkBubbleGtk::InitFolderComboModel
 leak:TranslateInfoBarBase::CreateLanguageCombobox
+leak:GtkNativeViewManager
+leak:_gdk_x11_window_get_toplevel
+leak:gtk_util::*AppModal
+
+# http://crbug.com/318221
+leak:base::EnsureProcessTerminated
+
+# PLEASE DO NOT ADD NEW SUPPRESSIONS HERE. See the comment above.