From 1f41354148ea97f62d14c038f5da8843ad77230f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Mon, 15 Aug 2011 18:20:15 -0700
Subject: [PATCH] Review comments for bug 645428

---
 .../test/browser/browser_645428.js            | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/browser/components/sessionstore/test/browser/browser_645428.js b/browser/components/sessionstore/test/browser/browser_645428.js
index 442ebd0c439..dcd0bca4a99 100644
--- a/browser/components/sessionstore/test/browser/browser_645428.js
+++ b/browser/components/sessionstore/test/browser/browser_645428.js
@@ -1,30 +1,21 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
-let ss = Cc["@mozilla.org/browser/sessionstore;1"]
-         .getService(Ci.nsISessionStore);
-
-let obs = Cc["@mozilla.org/observer-service;1"]
-          .getService(Ci.nsIObserverService);
-
 const NOTIFICATION = "sessionstore-browser-state-restored";
 
 function test() {
   waitForExplicitFinish();
 
-  let observer = {
-    observe: function (subject, topic, data) {
-      if (NOTIFICATION == topic)
-        finish();
-    },
+  function observe(subject, topic, data) {
+    if (NOTIFICATION == topic) {
+      finish();
+      ok(true, "TOPIC received");
+    }
+  }
 
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsIObserver,
-                                           Ci.nsISupportsWeakReference]),
-  };
-
-  obs.addObserver(observer, NOTIFICATION, true);
+  Services.obs.addObserver(observe, NOTIFICATION, false);
   registerCleanupFunction(function () {
-    obs.removeObserver(observer, NOTIFICATION, true);
+    Services.obs.removeObserver(observe, NOTIFICATION, false);
   });
 
   ss.setBrowserState(JSON.stringify({ windows: [] }));