DevTools: unify Network & CPU throttling

third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js

Index: third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
diff --git a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
index f888690b6322d0deb7ce9077023398b7482b3519..c30b9361d391d69a297eb3c36ea688cc8b8fa802 100644
--- a/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
+++ b/third_party/WebKit/Source/devtools/front_end/sdk/NetworkManager.js
@@ -74,7 +74,7 @@ SDK.NetworkManager = class extends SDK.SDKModel {
   }
 
   /**
-   * @param {!SDK.NetworkManager.Conditions} conditions
+   * @param {!SDK.MobileThrottling.Conditions} conditions
    * @return {!Protocol.Network.ConnectionType}
    * TODO(allada): this belongs to NetworkConditionsSelector, which should hardcode/guess it.
    */
@@ -154,23 +154,6 @@ SDK.NetworkManager._MIMETypes = {
   'text/vtt': {'texttrack': true},
 };
 
-
-/** @typedef {{download: number, upload: number, latency: number, title: string}} */
-SDK.NetworkManager.Conditions;
-/** @type {!SDK.NetworkManager.Conditions} */
-SDK.NetworkManager.NoThrottlingConditions = {
-  title: Common.UIString('No throttling'),
-  download: -1,
-  upload: -1,
-  latency: 0
-};
-/** @type {!SDK.NetworkManager.Conditions} */
-SDK.NetworkManager.OfflineConditions = {
-  title: Common.UIString('Offline'),
-  download: 0,
-  upload: 0,
-  latency: 0
-};
 /** @typedef {{url: string, enabled: boolean}} */
 SDK.NetworkManager.BlockedPattern;
 
@@ -699,8 +682,8 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
     this._userAgentOverride = '';
     /** @type {!Set<!Protocol.NetworkAgent>} */
     this._agents = new Set();
-    /** @type {!SDK.NetworkManager.Conditions} */
-    this._networkConditions = SDK.NetworkManager.NoThrottlingConditions;
+    /** @type {!SDK.MobileThrottling.Conditions} */
+    this._networkConditions = SDK.MobileThrottling.NoThrottlingConditions;
 
     this._blockingEnabledSetting = Common.moduleSetting('requestBlockingEnabled');
     this._blockedPatternsSetting = Common.settings.createSetting('networkBlockedPatterns', []);
@@ -764,7 +747,7 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
   }
 
   /**
-   * @param {!SDK.NetworkManager.Conditions} conditions
+   * @param {!SDK.MobileThrottling.Conditions} conditions
    */
   setNetworkConditions(conditions) {
     this._networkConditions = conditions;
@@ -774,7 +757,7 @@ SDK.MultitargetNetworkManager = class extends Common.Object {
   }
 
   /**
-   * @return {!SDK.NetworkManager.Conditions}
+   * @return {!SDK.MobileThrottling.Conditions}
    */
   networkConditions() {
     return this._networkConditions;