commit ba184a697325a89347339b7c104c7989d91156a1
author Trent Apted <tapted@chromium.org> Fri May 25 02:13:48 2018 +0000
committer Commit Bot <commit-bot@chromium.org> Fri May 25 02:13:48 2018 +0000
tree aa17770b625cb9f826bb72237992825cd6cb43de
parent 4edecad136c43e9061705b04ebcfaee04add778a

Revert "DevTools: [Audits] Roll Lighthouse to v3.0-beta"

This reverts commit a745fe4457a6dda2ebca843cfbb9a9ec16563805.

Bug: 846551

Reason for revert: Suspected for failures in


* http/tests/devtools/audits2/audits2-limited-run.js
* http/tests/devtools/audits2/audits2-successful-run.js

since

https://ci.chromium.org/buildbot/chromium.webkit/WebKit%20Mac10.11%20%28dbg%29/16181

Original change's description:
> DevTools: [Audits] Roll Lighthouse to v3.0-beta
> 
> Bug: 772558, 846211
> Change-Id: I4f74ea0d4a84908d2e7c4ccfe7035ee421bdf023
> Reviewed-on: https://chromium-review.googlesource.com/1070532
> Commit-Queue: Paul Irish <paulirish@chromium.org>
> Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#561412}

TBR=pfeldman@chromium.org,paulirish@chromium.org,phulce@chromium.org

Change-Id: I71f125736ac908f37c3d90988b85de51f4fb283c
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 772558, 846211
Reviewed-on: https://chromium-review.googlesource.com/1073008
Reviewed-by: Trent Apted <tapted@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#561735}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 28abe7802899b037a176426f883c750fec5a6d24

front_end/audits2/Audits2Controller.js

diff --git a/front_end/audits2/Audits2Controller.js b/front_end/audits2/Audits2Controller.js
index 2adb298..a33681c 100644
--- a/front_end/audits2/Audits2Controller.js
+++ b/front_end/audits2/Audits2Controller.js
@@ -254,50 +254,29 @@
   },
   {
     setting: Common.settings.createSetting('audits2.throttling', 'default'),
+    description: ls`Apply network and CPU throttling during performance auditing`,
     setFlags: (flags, value) => {
-  switch (value) {
-    case 'devtools':
-      flags.throttlingMethod = 'devtools';
-      break;
-    case 'off':
-      flags.throttlingMethod = 'provided';
-      break;
-    default:
-      flags.throttlingMethod = 'simulate';
-  }
+      flags.disableNetworkThrottling = value === 'off';
+      flags.disableCpuThrottling = value === 'off';
     },
     options: [
-      {
-        label: ls`Simulated Fast 3G, 4x CPU Slowdown`,
-        value: 'default',
-        title: 'Throttling is simulated, resulting in faster audit runs with similar measurement accuracy'
-      },
-      {
-        label: ls`Applied Fast 3G, 4x CPU Slowdown`,
-        value: 'devtools',
-        title: 'Typical DevTools throttling, with actual traffic shaping and CPU slowdown applied'
-      },
-      {
-        label: ls`No throttling`,
-        value: 'off',
-        title: 'No network or CPU throttling used. (Useful when not evaluating performance)'
-      },
+      {label: ls`Fast 3G with 4x CPU Slowdown`, value: 'default'},
+      {label: ls`No throttling`, value: 'off'},
     ],
   },
   {
     setting: Common.settings.createSetting('audits2.clear_storage', true),
     title: ls`Clear storage`,
-    description: ls
-    `Reset storage (localStorage, IndexedDB, etc) before auditing. (Recommended for performance & PWA testing)`,
+    description: ls`Reset storage (localStorage, IndexedDB, etc) to a clean baseline before auditing`,
     setFlags: (flags, value) => {
       flags.disableStorageReset = !value;
     },
   },
 ];
 
-    Audits2.Events = {
-      PageAuditabilityChanged: Symbol('PageAuditabilityChanged'),
-      AuditProgressChanged: Symbol('AuditProgressChanged'),
-      RequestAuditStart: Symbol('RequestAuditStart'),
-      RequestAuditCancel: Symbol('RequestAuditCancel'),
-    };
+Audits2.Events = {
+  PageAuditabilityChanged: Symbol('PageAuditabilityChanged'),
+  AuditProgressChanged: Symbol('AuditProgressChanged'),
+  RequestAuditStart: Symbol('RequestAuditStart'),
+  RequestAuditCancel: Symbol('RequestAuditCancel'),
+};
\ No newline at end of file