DevTools: unify Network & CPU throttling

third_party/WebKit/Source/devtools/front_end/mobile_throttling/module.json

Index: third_party/WebKit/Source/devtools/front_end/mobile_throttling/module.json
diff --git a/third_party/WebKit/Source/devtools/front_end/mobile_throttling/module.json b/third_party/WebKit/Source/devtools/front_end/mobile_throttling/module.json
index f9741fd32a9188091b144e4edfe17f1e1c580852..be30ce84d4839105a8da0c6a17809cfe73d9be61 100644
--- a/third_party/WebKit/Source/devtools/front_end/mobile_throttling/module.json
+++ b/third_party/WebKit/Source/devtools/front_end/mobile_throttling/module.json
@@ -6,6 +6,13 @@
             "settingType": "array",
             "defaultValue": []
         },
+        {
+            "type": "setting",
+            "settingName": "cpuThrottlingRate",

[dgozman, 2017/06/28 22:33:09]

This setting should either be in SDK, or be removed completely. Since You have
CPUThrottlingManager, it should have a getter for the rate as well as an event
for when the rate changes.

[chenwilliam, 2017/06/29 20:34:02]

OK, removed this and switched to using the manager for communicating state.

+            "settingType": "number",
+            "storageType": "session",
+            "defaultValue": 1
+        },
         {
             "type": "@UI.ActionDelegate",
             "actionId": "network-conditions.network-offline",
@@ -25,10 +32,10 @@
         {
             "type": "view",
             "location": "settings-view",
-            "id": "network-conditions",
+            "id": "throttling-conditions",
             "title": "Throttling",
             "order": 35,
-            "className": "MobileThrottling.NetworkConditionsSettingsTab",
+            "className": "MobileThrottling.ThrottlingSettingsTab",
             "settings": [
                 "customNetworkConditions"
             ]
@@ -41,11 +48,11 @@
         "protocol"
     ],
     "scripts": [
-        "NetworkConditionsSelector.js",
-        "NetworkConditionsSettingsTab.js",
+        "ThrottlingSelector.js",
+        "ThrottlingSettingsTab.js",
         "CPUThrottlingManager.js"
     ],
     "resources": [
-        "networkConditionsSettingsTab.css"
+        "throttlingSettingsTab.css"
     ]
 }