Backed out changeset 2631d596fc32 (bug 1264929) for dt1 failures on OS X and Win7

devtools/client/aboutdebugging/components/aboutdebugging.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const { createFactory, createClass, DOM: dom, PropTypes } =
+const { createFactory, createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const Services = require("Services");
 
@@ -19,11 +19,6 @@ loader.lazyGetter(this, "TabsPanel",
 loader.lazyGetter(this, "WorkersPanel",
   () => createFactory(require("./workers/panel")));
 
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-loader.lazyRequireGetter(this, "Telemetry",
-  "devtools/client/shared/telemetry");
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
@@ -49,11 +44,6 @@ const defaultPanelId = "addons";
 module.exports = createClass({
   displayName: "AboutDebuggingApp",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    telemetry: PropTypes.instanceOf(Telemetry).isRequired
-  },
-
   getInitialState() {
     return {
       selectedPanelId: defaultPanelId

devtools/client/aboutdebugging/components/addons/controls.js

@@ -11,7 +11,7 @@ loader.lazyImporter(this, "AddonManager",
   "resource://gre/modules/AddonManager.jsm");
 
 const { Cc, Ci } = require("chrome");
-const { createFactory, createClass, DOM: dom, PropTypes } =
+const { createFactory, createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const Services = require("Services");
 const AddonsInstallError = createFactory(require("./install-error"));
@@ -25,10 +25,6 @@ const MORE_INFO_URL = "https://developer.mozilla.org/docs/Tools" +
 module.exports = createClass({
   displayName: "AddonsControls",
 
-  propTypes: {
-    debugDisabled: PropTypes.bool
-  },
-
   getInitialState() {
     return {
       installError: null,

devtools/client/aboutdebugging/components/addons/install-error.js

@@ -5,15 +5,11 @@
 /* eslint-env browser */
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } = require("devtools/client/shared/vendor/react");
+const { createClass, DOM: dom } = require("devtools/client/shared/vendor/react");
 
 module.exports = createClass({
   displayName: "AddonsInstallError",
 
-  propTypes: {
-    error: PropTypes.string
-  },
-
   render() {
     if (!this.props.error) {
       return null;

devtools/client/aboutdebugging/components/addons/panel.js

@@ -5,7 +5,7 @@
 "use strict";
 
 const { AddonManager } = require("resource://gre/modules/AddonManager.jsm");
-const { createFactory, createClass, DOM: dom, PropTypes } =
+const { createFactory, createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const Services = require("Services");
 
@@ -14,9 +14,6 @@ const AddonTarget = createFactory(require("./target"));
 const PanelHeader = createFactory(require("../panel-header"));
 const TargetList = createFactory(require("../target-list"));
 
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
@@ -27,11 +24,6 @@ const REMOTE_ENABLED_PREF = "devtools.debugger.remote-enabled";
 module.exports = createClass({
   displayName: "AddonsPanel",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    id: PropTypes.string.isRequired
-  },
-
   getInitialState() {
     return {
       extensions: [],
@@ -133,7 +125,6 @@ module.exports = createClass({
     AddonsControls({ debugDisabled }),
     dom.div({ id: "addons" },
       TargetList({
-        id: "extensions",
         name,
         targets,
         client,

devtools/client/aboutdebugging/components/addons/target.js

@@ -6,35 +6,17 @@
 
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } =
+const { createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const { debugAddon } = require("../../modules/addon");
 const Services = require("Services");
 
-loader.lazyImporter(this, "BrowserToolboxProcess",
-  "resource://devtools/client/framework/ToolboxProcess.jsm");
-
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
 module.exports = createClass({
   displayName: "AddonTarget",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    debugDisabled: PropTypes.bool,
-    target: PropTypes.shape({
-      addonActor: PropTypes.string.isRequired,
-      addonID: PropTypes.string.isRequired,
-      icon: PropTypes.string,
-      name: PropTypes.string.isRequired,
-      temporarilyInstalled: PropTypes.bool
-    }).isRequired
-  },
-
   debug() {
     let { target } = this.props;
     debugAddon(target.addonID);

devtools/client/aboutdebugging/components/panel-header.js

@@ -4,17 +4,12 @@
 
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } =
+const { createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 
 module.exports = createClass({
   displayName: "PanelHeader",
 
-  propTypes: {
-    id: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired
-  },
-
   render() {
     let { name, id } = this.props;
 

devtools/client/aboutdebugging/components/panel-menu-entry.js

@@ -4,20 +4,12 @@
 
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } =
+const { createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 
 module.exports = createClass({
   displayName: "PanelMenuEntry",
 
-  propTypes: {
-    icon: PropTypes.string.isRequired,
-    id: PropTypes.string.isRequired,
-    name: PropTypes.string.isRequired,
-    selected: PropTypes.bool,
-    selectPanel: PropTypes.func.isRequired
-  },
-
   onClick() {
     this.props.selectPanel(this.props.id);
   },

devtools/client/aboutdebugging/components/panel-menu.js

@@ -4,24 +4,13 @@
 
 "use strict";
 
-const { createClass, createFactory, DOM: dom, PropTypes } =
+const { createClass, createFactory, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const PanelMenuEntry = createFactory(require("./panel-menu-entry"));
 
 module.exports = createClass({
   displayName: "PanelMenu",
 
-  propTypes: {
-    panels: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.string.isRequired,
-      name: PropTypes.string.isRequired,
-      icon: PropTypes.string.isRequired,
-      component: PropTypes.func.isRequired
-    })).isRequired,
-    selectPanel: PropTypes.func.isRequired,
-    selectedPanelId: PropTypes.string
-  },
-
   render() {
     let { panels, selectedPanelId, selectPanel } = this.props;
     let panelLinks = panels.map(({ id, name, icon }) => {

devtools/client/aboutdebugging/components/tabs/panel.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const { createClass, createFactory, DOM: dom, PropTypes } =
+const { createClass, createFactory, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const Services = require("Services");
 
@@ -14,20 +14,12 @@ const PanelHeader = createFactory(require("../panel-header"));
 const TargetList = createFactory(require("../target-list"));
 const TabTarget = createFactory(require("./target"));
 
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
 module.exports = createClass({
   displayName: "TabsPanel",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    id: PropTypes.string.isRequired
-  },
-
   getInitialState() {
     return {
       tabs: []

devtools/client/aboutdebugging/components/tabs/target.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } =
+const { createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const Services = require("Services");
 
@@ -16,15 +16,6 @@ const Strings = Services.strings.createBundle(
 module.exports = createClass({
   displayName: "TabTarget",
 
-  propTypes: {
-    target: PropTypes.shape({
-      icon: PropTypes.string,
-      outerWindowID: PropTypes.number.isRequired,
-      title: PropTypes.string,
-      url: PropTypes.string.isRequired
-    }).isRequired
-  },
-
   debug() {
     let { target } = this.props;
     window.open("about:devtools-toolbox?type=tab&id=" + target.outerWindowID);

devtools/client/aboutdebugging/components/target-list.js

@@ -4,13 +4,10 @@
 
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } =
+const { createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const Services = require("Services");
 
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
@@ -21,17 +18,6 @@ const LocaleCompare = (a, b) => {
 module.exports = createClass({
   displayName: "TargetList",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    debugDisabled: PropTypes.bool,
-    error: PropTypes.node,
-    id: PropTypes.string.isRequired,
-    name: PropTypes.string,
-    sort: PropTypes.bool,
-    targetClass: PropTypes.func.isRequired,
-    targets: PropTypes.arrayOf(PropTypes.object).isRequired
-  },
-
   render() {
     let { client, debugDisabled, error, targetClass, targets, sort } = this.props;
     if (sort) {

devtools/client/aboutdebugging/components/workers/panel.js

@@ -8,7 +8,7 @@ loader.lazyImporter(this, "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm");
 
 const { Ci } = require("chrome");
-const { createClass, createFactory, DOM: dom, PropTypes } =
+const { createClass, createFactory, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const { getWorkerForms } = require("../../modules/worker");
 const Services = require("Services");
@@ -18,12 +18,6 @@ const TargetList = createFactory(require("../target-list"));
 const WorkerTarget = createFactory(require("./target"));
 const ServiceWorkerTarget = createFactory(require("./service-worker-target"));
 
-loader.lazyImporter(this, "PrivateBrowsingUtils",
-  "resource://gre/modules/PrivateBrowsingUtils.jsm");
-
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
@@ -33,11 +27,6 @@ const MORE_INFO_URL = "https://developer.mozilla.org/en-US/docs/Tools/about%3Ade
 module.exports = createClass({
   displayName: "WorkersPanel",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    id: PropTypes.string.isRequired
-  },
-
   getInitialState() {
     return {
       workers: {

devtools/client/aboutdebugging/components/workers/service-worker-target.js

@@ -6,34 +6,17 @@
 
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } =
+const { createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const { debugWorker } = require("../../modules/worker");
 const Services = require("Services");
 
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
 module.exports = createClass({
   displayName: "ServiceWorkerTarget",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    debugDisabled: PropTypes.bool,
-    target: PropTypes.shape({
-      active: PropTypes.bool,
-      icon: PropTypes.string,
-      name: PropTypes.string.isRequired,
-      url: PropTypes.string,
-      scope: PropTypes.string.isRequired,
-      registrationActor: PropTypes.string.isRequired,
-      workerActor: PropTypes.string
-    }).isRequired
-  },
-
   getInitialState() {
     return {
       pushSubscription: null

devtools/client/aboutdebugging/components/workers/target.js

@@ -6,30 +6,17 @@
 
 "use strict";
 
-const { createClass, DOM: dom, PropTypes } =
+const { createClass, DOM: dom } =
   require("devtools/client/shared/vendor/react");
 const { debugWorker } = require("../../modules/worker");
 const Services = require("Services");
 
-loader.lazyRequireGetter(this, "DebuggerClient",
-  "devtools/shared/client/main", true);
-
 const Strings = Services.strings.createBundle(
   "chrome://devtools/locale/aboutdebugging.properties");
 
 module.exports = createClass({
   displayName: "WorkerTarget",
 
-  propTypes: {
-    client: PropTypes.instanceOf(DebuggerClient).isRequired,
-    debugDisabled: PropTypes.bool,
-    target: PropTypes.shape({
-      icon: PropTypes.string,
-      name: PropTypes.string.isRequired,
-      workerActor: PropTypes.string
-    }).isRequired
-  },
-
   debug() {
     let { client, target } = this.props;
     debugWorker(client, target.workerActor);