Merge pull request #904 from ochameau/bug855354

Bug 855354: Stop using chrome console object in content script API implementation. r=@Mossop
mozilla · Mar 28, 2013 · 2354c29 · 2354c29
2 parents 8f630e9 + eaaf4ce
commit 2354c29
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/sdk/content/content-worker.js b/lib/sdk/content/content-worker.js
@@ -224,7 +224,7 @@ const ContentWorker = Object.freeze({
     });
   },
 
-  injectMessageAPI: function injectMessageAPI(exports, pipe) {
+  injectMessageAPI: function injectMessageAPI(exports, pipe, console) {
 
     let { eventEmitter: port, emit : portEmit } =
       ContentWorker.createEventEmitter(pipe.emit.bind(null, "event"));
@@ -293,7 +293,7 @@ const ContentWorker = Object.freeze({
 
     ContentWorker.injectConsole(exports, pipe);
     ContentWorker.injectTimers(exports, chromeAPI, pipe, exports.console);
-    ContentWorker.injectMessageAPI(exports, pipe);
+    ContentWorker.injectMessageAPI(exports, pipe, exports.console);
     if ( options !== undefined ) {
       ContentWorker.injectOptions(exports, options);
     }

diff --git a/lib/sdk/test/loader.js b/lib/sdk/test/loader.js
@@ -51,7 +51,11 @@ exports.LoaderWithHookedConsole = function (module, callback) {
         warn: hook.bind("warn"),
         error: hook.bind("error"),
         debug: hook.bind("debug"),
-        exception: hook.bind("exception")
+        exception: hook.bind("exception"),
+        __exposedProps__: {
+          log: "rw", info: "rw", warn: "rw", error: "rw", debug: "rw",
+          exception: "rw"
+        }
       }
     }),
     messages: messages