[polymer] Merge of master into polymer10-migration

tracing/tracing/extras/vsync/vsync_auditor_test.html

Index: tracing/tracing/extras/vsync/vsync_auditor_test.html
diff --git a/tracing/tracing/extras/vsync/vsync_auditor_test.html b/tracing/tracing/extras/vsync/vsync_auditor_test.html
index 4f4523aef71311fcf81871fa80eb1ef56b7a60d6..4672fe353eb43df494ba1cdd05a466ea024efbe9 100644
--- a/tracing/tracing/extras/vsync/vsync_auditor_test.html
+++ b/tracing/tracing/extras/vsync/vsync_auditor_test.html
@@ -79,6 +79,14 @@ tr.b.unittest.testSuite(function() {
     ], [], [1, 5, 6, 7]);
   });
 
+  test('filterNearDuplicates', function() {
+    testFindVSyncTimestamps([
+        [buildSlice('VSYNC', 1), buildSlice('VSYNC', 1)],
+        [buildSlice('VSYNC', 2), buildSlice('VSYNC', 2.1)],
+        [buildSlice('VSYNC', 3), buildSlice('VSYNC', 4)],
+    ], [], [1, 2, 3, 4]);
+  });
+
   test('findMultipleAndroidVsyncs', function() {
     testFindVSyncTimestamps([
         [buildSlice('MessageLoop::RunTask', 2)],
@@ -113,7 +121,7 @@ tr.b.unittest.testSuite(function() {
   });
 
   test('findBeginFrame', function() {
-    var title = 'Scheduler::BeginFrame';
+    var title = 'DisplayScheduler::BeginFrame';
     testFindVSyncTimestamps([[
       new ThreadSlice('', title, 0, 2, { args: { frame_time_us: 1000 } }),
       new ThreadSlice('', title, 0, 4, { args: { frame_time_us: 3000 } })
@@ -121,7 +129,7 @@ tr.b.unittest.testSuite(function() {
   });
 
   test('findBeginFrame_noFrameTime', function() {
-    var title = 'Scheduler::BeginFrame';
+    var title = 'DisplayScheduler::BeginFrame';
     testFindVSyncTimestamps([[
       new ThreadSlice('', title, 0, 2, {}),
       new ThreadSlice('', title, 0, 4, { args: {} })