Merge from Chromium at DEPS revision r214456

This commit was generated by merge_to_master.py.

Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964

6 files changed, 25 insertions, 23 deletions

diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 25cbcbb6bc..ad1508c08b 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -614,12 +614,10 @@
    ...
    fun:v8::internal::Heap::DoScavenge*
    fun:v8::internal::Heap::Scavenge*
+   ...
    fun:v8::internal::Heap::PerformGarbageCollection
    fun:v8::internal::Heap::CollectGarbage
    fun:v8::internal::Heap::CollectGarbage
-   fun:v8::internal::Factory::NewStringFromUtf8
-   ...
-   fun:v8::String::NewFromUtf8
 }
 {
    bug_171547_b
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 482c83a13f..3540389494 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -12828,6 +12828,17 @@ other types of suffix sets.
   </summary>
 </histogram>
 
+<histogram name="Settings.StartupPageLoadSettings" enum="SessionStartupPref">
+  <summary>The startup page settings when a profile is loaded.</summary>
+</histogram>
+
+<histogram name="Settings.StartupPageLoadURLs">
+  <summary>
+    The number of URLs to be loaded on startup when a profile is loaded, if the
+    startup page setting is set to load URLs.
+  </summary>
+</histogram>
+
 <histogram name="SimpleCache.CheckCRCResult" enum="CheckCRCResult">
   <summary>
     Whether or not the CRC was checked at the moment when the last reference to
@@ -20513,6 +20524,13 @@ other types of suffix sets.
   <int value="1" label="Scroll on main-thread"/>
 </enum>
 
+<enum name="SessionStartupPref" type="int">
+  <int value="0" label="Open home page (unused)"/>
+  <int value="1" label="Continue from last opened pages"/>
+  <int value="4" label="Open URLs"/>
+  <int value="5" label="Open new tab page"/>
+</enum>
+
 <enum name="ShillTerminationActionResult" type="int">
   <summary>
     The termination action result types come from TerminationActionResult in
diff --git a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py
index 2ede95dfb2..854ce5287d 100644
--- a/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py
+++ b/tools/telemetry/telemetry/core/chrome/cros_browser_backend.py
@@ -140,7 +140,10 @@ class CrOSBrowserBackend(browser_backend.BrowserBackend):
             # Allow devtools to connect to chrome.
             '--remote-debugging-port=%i' % self._remote_debugging_port,
             # Open a maximized window.
-            '--start-maximized'])
+            '--start-maximized',
+            # Debug logging for login flake (crbug.com/263527).
+            '--vmodule=*/browser/automation/*=2,*/chromeos/net/*=2,' +
+                '*/chromeos/login/*=2'])
 
     if not self._is_guest:
       # This extension bypasses gaia and logs us in.
diff --git a/tools/valgrind/gtest_exclude/base_unittests.gtest.txt b/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
index 8270720c4e..35c209db10 100644
--- a/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
+++ b/tools/valgrind/gtest_exclude/base_unittests.gtest.txt
@@ -24,7 +24,3 @@ ConditionVariableTest.LargeFastTaskTest
 
 # Flaky under Valgrind, see http://crbug.com/55517
 PlatformFile.TouchGetInfoPlatformFile
-
-# Death test crashes with NULL deref, probably not intended.
-# http://crbug.com/261141
-SequenceCheckerTest.*DeathTest*
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index f5b0ed4023..bb2330e4d7 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -3300,20 +3300,6 @@
    fun:_ZN19URLRequestChromeJob10StartAsyncEv
 }
 {
-   bug_92389
-   Memcheck:Leak
-   fun:_Znw*
-   fun:_ZN3net11AddressList27CreateByCopyingFirstAddressEPK8addrinfo
-   fun:_ZNK3net23TCPClientSocketLibevent14GetPeerAddressEPNS_11AddressListE
-   ...
-   fun:_ZN3net22HttpNetworkTransaction13DoSendRequestEv
-   fun:_ZN3net22HttpNetworkTransaction6DoLoopEi
-   fun:_ZN3net22HttpNetworkTransaction12OnIOCompleteEi
-   fun:_ZN3net22HttpNetworkTransaction13OnStreamReadyERKNS_9SSLConfigERKNS_9ProxyInfoEPNS_10HttpStreamE
-   fun:_ZN3net21HttpStreamFactoryImpl7Request*
-   fun:_ZN3net21HttpStreamFactoryImpl3Job*
-}
-{
    bug_92571
    Memcheck:Leak
    fun:_Znw*
diff --git a/tools/valgrind/tsan/ignores_win32.txt b/tools/valgrind/tsan/ignores_win32.txt
index 49bfa76a5a..141151ed94 100644
--- a/tools/valgrind/tsan/ignores_win32.txt
+++ b/tools/valgrind/tsan/ignores_win32.txt
@@ -52,8 +52,9 @@ fun:_ff_prefetch_mmxext
 # See: https://code.google.com/p/data-race-test/issues/detail?id=114
 fun_r:SHFileOperationW
 
-# Ignore internal file I/O synchronization:
+# Ignore internal file I/O synchronization: crbug.com/146724
 fun_r:_lock_file
+fun_r:_lock_file2
 fun_r:_lock
 fun_r:_flsbuf
 fun_r:_unlock_file