Re-home the global MessageCenter to support Ash+Win environments.

ui/message_center/message_center_tray_unittest.cc

Index: ui/message_center/message_center_tray_unittest.cc
diff --git a/ui/message_center/message_center_tray_unittest.cc b/ui/message_center/message_center_tray_unittest.cc
index 406e360a93004ab07369b346961706c8b5753566..bd9271fa575f6a3bfea0fd167503a3ce14b28ecf 100644
--- a/ui/message_center/message_center_tray_unittest.cc
+++ b/ui/message_center/message_center_tray_unittest.cc
@@ -43,22 +43,24 @@ class MessageCenterTrayTest : public testing::Test {
   virtual ~MessageCenterTrayTest() {}
 
   virtual void SetUp() {
+    MessageCenter::Initialize();
     delegate_.reset(new MockDelegate);
-    message_center_.reset(new MessageCenter());
+    message_center_ = MessageCenter::Get();
     message_center_tray_.reset(
-        new MessageCenterTray(delegate_.get(), message_center_.get()));
+        new MessageCenterTray(delegate_.get(), message_center_));
   }
 
   virtual void TearDown() {
     message_center_tray_.reset();
-    message_center_.reset();
     delegate_.reset();
+    message_center_ = NULL;
+    MessageCenter::Shutdown();
   }
 
  protected:
   scoped_ptr<MockDelegate> delegate_;
   scoped_ptr<MessageCenterTray> message_center_tray_;
-  scoped_ptr<MessageCenter> message_center_;
+  MessageCenter* message_center_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MessageCenterTrayTest);