Revert "[system_health] add infinite scrolling for Twitter using performance.mark metrics"

This reverts commit 5db0bd08.

Reason for revert: Test is failing on Mac10.14 Tests 

Original change's description:
> [system_health] add infinite scrolling for Twitter using performance.mark metrics
> 
> R=​johnchen@chromium.org
> CC=​​cbruni@chromium.org,jdecaires@twitter.com
> 
> Bug: 1114635
> Change-Id: I8d569776bd0f6fdbb656d70172f70c6f08ca3cbe
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2352939
> Auto-Submit: Tamer Tas <tmrts@chromium.org>
> Commit-Queue: Tamer Tas <tmrts@google.com>
> Reviewed-by: John Chen <johnchen@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#799056}

TBR=johnchen@chromium.org,tmrts@chromium.org,tmrts@google.com

Change-Id: I15f87c0a0374759a7d12b61415f38c11df60a537
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1114635
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2363067Reviewed-by: Chris Sharp <csharp@chromium.org>
Commit-Queue: Chris Sharp <csharp@chromium.org>
Cr-Commit-Position: refs/heads/master@{#799076}

tools/perf/core/shard_maps/timing_data/linux-perf_timing.json

@@ -3127,6 +3127,10 @@
         "duration": "86.0",
         "name": "system_health.common_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "118.0",
+        "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "114.0",
         "name": "system_health.common_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3391,6 +3395,10 @@
         "duration": "78.0",
         "name": "system_health.memory_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "110.0",
+        "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "102.0",
         "name": "system_health.memory_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3695,6 +3703,10 @@
         "duration": "98.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
     },
+    {
+        "duration": "130.0",
+        "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "126.0",
         "name": "v8.browsing_desktop-future/browse:tech:discourse_infinite_scroll:2018"
@@ -3767,6 +3779,10 @@
         "duration": "98.0",
         "name": "v8.browsing_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "136.0",
+        "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "144.0",
         "name": "v8.browsing_desktop/browse:tech:discourse_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/mac-10_12_laptop_low_end-perf_timing.json

@@ -3163,6 +3163,10 @@
         "duration": "100.0",
         "name": "system_health.common_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "134.0",
+        "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "130.0",
         "name": "system_health.common_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3427,6 +3431,10 @@
         "duration": "92.0",
         "name": "system_health.memory_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "126.0",
+        "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "120.0",
         "name": "system_health.memory_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3731,6 +3739,10 @@
         "duration": "122.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
     },
+    {
+        "duration": "156.0",
+        "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "148.0",
         "name": "v8.browsing_desktop-future/browse:tech:discourse_infinite_scroll:2018"
@@ -3803,6 +3815,10 @@
         "duration": "122.0",
         "name": "v8.browsing_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "158.0",
+        "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "146.0",
         "name": "v8.browsing_desktop/browse:tech:discourse_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/mac-10_13_laptop_high_end-perf_timing.json

@@ -3159,6 +3159,10 @@
         "duration": "96.0",
         "name": "system_health.common_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "124.0",
+        "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "116.0",
         "name": "system_health.common_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3427,6 +3431,10 @@
         "duration": "82.0",
         "name": "system_health.memory_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "118.0",
+        "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "110.0",
         "name": "system_health.memory_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3735,6 +3743,10 @@
         "duration": "98.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
     },
+    {
+        "duration": "132.0",
+        "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "138.0",
         "name": "v8.browsing_desktop-future/browse:tech:discourse_infinite_scroll:2018"
@@ -3811,6 +3823,10 @@
         "duration": "104.0",
         "name": "v8.browsing_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "140.0",
+        "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "126.0",
         "name": "v8.browsing_desktop/browse:tech:discourse_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/win-10-perf_timing.json

@@ -3127,6 +3127,10 @@
         "duration": "90.0",
         "name": "system_health.common_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "124.0",
+        "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "118.0",
         "name": "system_health.common_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3391,6 +3395,10 @@
         "duration": "86.0",
         "name": "system_health.memory_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "116.0",
+        "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "108.0",
         "name": "system_health.memory_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3695,6 +3703,10 @@
         "duration": "100.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
     },
+    {
+        "duration": "132.0",
+        "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "138.0",
         "name": "v8.browsing_desktop-future/browse:tech:discourse_infinite_scroll:2018"
@@ -3767,6 +3779,10 @@
         "duration": "100.0",
         "name": "v8.browsing_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "134.0",
+        "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "132.0",
         "name": "v8.browsing_desktop/browse:tech:discourse_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_hp-candidate_timing.json

@@ -55,6 +55,10 @@
         "duration": "76.0",
         "name": "v8.browsing_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "103.0",
+        "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "98.0",
         "name": "v8.browsing_desktop/browse:tech:discourse_infinite_scroll:2018"

tools/perf/core/shard_maps/timing_data/win-10_laptop_low_end-perf_timing.json

@@ -3127,6 +3127,10 @@
         "duration": "124.0",
         "name": "system_health.common_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "158.0",
+        "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "150.0",
         "name": "system_health.common_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3391,6 +3395,10 @@
         "duration": "104.0",
         "name": "system_health.memory_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "138.0",
+        "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "130.0",
         "name": "system_health.memory_desktop/browse:tech:discourse_infinite_scroll:2018"
@@ -3695,6 +3703,10 @@
         "duration": "158.0",
         "name": "v8.browsing_desktop-future/browse:social:twitter:2018"
     },
+    {
+        "duration": "194.0",
+        "name": "v8.browsing_desktop-future/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "184.0",
         "name": "v8.browsing_desktop-future/browse:tech:discourse_infinite_scroll:2018"
@@ -3767,6 +3779,10 @@
         "duration": "162.0",
         "name": "v8.browsing_desktop/browse:social:twitter:2018"
     },
+    {
+        "duration": "190.0",
+        "name": "v8.browsing_desktop/browse:social:twitter_infinite_scroll:2018"
+    },
     {
         "duration": "184.0",
         "name": "v8.browsing_desktop/browse:tech:discourse_infinite_scroll:2018"

tools/perf/expectations.config

@@ -345,7 +345,7 @@ crbug.com/956191 [ win7 ] system_health.memory_desktop/browse:news:nytimes:2020
 crbug.com/1097065 [ linux ] system_health.memory_desktop/browse:media:googleplaystore:2018 [ Skip ]
 crbug.com/1097065 [ linux ] system_health.memory_desktop/load:social:vk:2018 [ Skip ]
 crbug.com/1097065 [ linux ] system_health.memory_desktop/browse_accessibility:tech:codesearch:2018 [ Skip ]
-crbug.com/1114120 [ linux ] system_health.memory_desktop/browse:social:twitter_infinite_scroll:2020 [ Skip ]
+crbug.com/1114120 [ win ] system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018 [ Skip ]
 crbug.com/1044682 [ desktop ] system_health.memory_desktop/browse:tools:gmail-labelclick:2020 [ Skip ]
 crbug.com/1044682 [ desktop ] system_health.memory_desktop/browse:tools:gmail-openconversation:2020 [ Skip ]
 crbug.com/1044682 [ desktop ] system_health.memory_desktop/browse:tools:gmail-search:2020 [ Skip ]

tools/perf/page_sets/data/system_health_desktop.json

@@ -106,9 +106,6 @@
         "browse:social:twitter_infinite_scroll:2018": {
             "DEFAULT": "system_health_desktop_f6af33019a.wprgo"
         },
-        "browse:social:twitter_infinite_scroll:2020": {
-            "DEFAULT": "system_health_desktop_ae16a7fe32.wprgo"
-        },
         "browse:tech:discourse_infinite_scroll": {
             "DEFAULT": "system_health_desktop_058.wprgo"
         },
@@ -439,4 +436,4 @@
     },
     "description": "Describes the Web Page Replay archives for a story set. Don't edit by hand! Use record_wpr for updating.",
     "platform_specific": true
-}
+}
\ No newline at end of file

tools/perf/page_sets/data/system_health_desktop_ae16a7fe32.wprgo.sha1

-ae16a7fe3272cc66202322b23cf2c2921fa54fde
\ No newline at end of file

tools/perf/page_sets/system_health/browsing_stories.py

@@ -1815,61 +1815,8 @@ class TumblrStory2018(_InfiniteScrollStory):
     # go to the https://techcrunch.tumblr.com
     action_runner.ReloadPage()
 
-
-class TwitterScrollDesktopStory2020(_InfiniteScrollStory):
-  NAME = 'browse:social:twitter_infinite_scroll:2020'
-  URL = 'https://twitter.com/AbeShinzo?lang=ja'
+class TwitterScrollDesktopStory2018(_InfiniteScrollStory):
+  NAME = 'browse:social:twitter_infinite_scroll:2018'
+  URL = 'https://twitter.com/NASA'
   SUPPORTED_PLATFORMS = platforms.DESKTOP_ONLY
-  TAGS = [
-      story_tags.INFINITE_SCROLL, story_tags.INTERNATIONAL, story_tags.YEAR_2020
-  ]
-
-  # This map translates page-specific event names to event names needed for
-  # the reported_by_page:* metric.
-  EVENTS_REPORTED_BY_PAGE = '''
-    window.__telemetry_reported_page_events = {
-      'ttft':
-          'telemetry:reported_by_page:viewable',
-      'tti':
-          'telemetry:reported_by_page:interactive'
-    };
-  '''
-
-  # Patch performance.mark to get notified about page events.
-  PERFORMANCE_MARK_PATCH = '''
-    window.__telemetry_observed_page_events = new Set();
-    (function () {
-      let reported = window.__telemetry_reported_page_events;
-      let observed = window.__telemetry_observed_page_events;
-      let performance_mark = window.performance.mark;
-      window.performance.mark = function (label) {
-        performance_mark.call(window.performance, label);
-        if (reported.hasOwnProperty(label)) {
-          performance_mark.call(
-              window.performance, reported[label]);
-          observed.add(reported[label]);
-        }
-      }
-    })();
-  '''
-
-  # Page event queries.
-  INTERACTIVE_EVENT = '''
-    (window.__telemetry_observed_page_events.has(
-        "telemetry:reported_by_page:interactive"))
-  '''
-
-  def __init__(self, story_set, take_memory_measurement):
-    super(TwitterScrollDesktopStory2020,
-          self).__init__(story_set, take_memory_measurement)
-    self.script_to_evaluate_on_commit = js_template.Render(
-        '''{{@events_reported_by_page}}
-        {{@performance_mark}}''',
-        events_reported_by_page=self.EVENTS_REPORTED_BY_PAGE,
-        performance_mark=self.PERFORMANCE_MARK_PATCH)
-
-  def _DidLoadDocument(self, action_runner):
-    # 1. Wait until the page load.
-    action_runner.WaitForJavaScriptCondition(self.INTERACTIVE_EVENT)
-
-    super(TwitterScrollDesktopStory2020, self)._DidLoadDocument(action_runner)
+  TAGS = [story_tags.INFINITE_SCROLL, story_tags.YEAR_2018]

tools/perf/system_health_stories.csv

@@ -46,7 +46,7 @@ browse:social:pinterest_infinite_scroll:2019,,mobile,"2019,health_check,infinite
 browse:social:tumblr_infinite_scroll:2018,,"desktop,mobile","2018,health_check,infinite_scroll,javascript_heavy"
 browse:social:twitter:2018,,desktop,2018
 browse:social:twitter:2019,,mobile,"2019,health_check"
-browse:social:twitter_infinite_scroll:2020,,desktop,"2020,infinite_scroll,international"
+browse:social:twitter_infinite_scroll:2018,,desktop,"2018,infinite_scroll"
 browse:tech:discourse_infinite_scroll:2018,,"desktop,mobile","2018,infinite_scroll"
 browse:tools:docs_scrolling,Google Docs scrolling story:,desktop,"2020,javascript_heavy"
 browse:tools:earth:2020,Load Google Earth and search for the Empire State Building. Watch the,desktop,"2020,keyboard_input,wasm,webgl"