Use a NotificationRegistrar to listen for notifications.

BUG=2381
Review URL: http://codereview.chromium.org/113717

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16665 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 9 deletions

diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index 0e1b5c4..3b92d24 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -11,6 +11,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -36,18 +37,11 @@ class UserScriptMasterTest : public testing::Test,
     file_util::CreateDirectory(script_dir_);
 
     // Register for all user script notifications.
-    NotificationService::current()->AddObserver(
-        this,
-        NotificationType::USER_SCRIPTS_LOADED,
-        NotificationService::AllSources());
+    registrar_.Add(this, NotificationType::USER_SCRIPTS_LOADED,
+                   NotificationService::AllSources());
   }
 
   virtual void TearDown() {
-    NotificationService::current()->RemoveObserver(
-        this,
-        NotificationType::USER_SCRIPTS_LOADED,
-        NotificationService::AllSources());
-
     // Clean up test directory.
     ASSERT_TRUE(file_util::Delete(script_dir_, true));
     ASSERT_FALSE(file_util::PathExists(script_dir_));
@@ -63,6 +57,8 @@ class UserScriptMasterTest : public testing::Test,
       MessageLoop::current()->Quit();
   }
 
+  NotificationRegistrar registrar_;
+
   // MessageLoop used in tests.
   MessageLoop message_loop_;