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

chrome/test/base/testing_browser_process.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/testing_browser_process.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 16 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "chrome/browser/policy/browser_policy_connector.h"
 #else
 #include "chrome/browser/policy/policy_service_stub.h"
 #endif  // defined(ENABLE_CONFIGURATION_POLICY)
 
-#if defined(ENABLE_MESSAGE_CENTER) && defined(USE_ASH)
-#include "ash/shell.h"
-#endif
-
 #if defined(ENABLE_MESSAGE_CENTER)
 #include "ui/message_center/message_center.h"
 #endif
 
 // static
 TestingBrowserProcess* TestingBrowserProcess::GetGlobal() {
   return static_cast<TestingBrowserProcess*>(g_browser_process);
 }
 
 TestingBrowserProcess::TestingBrowserProcess()
@@ skipping 143 matching lines @@
         NotificationUIManager::Create(local_state()));
   return notification_ui_manager_.get();
 #else
   NOTIMPLEMENTED();
   return NULL;
 #endif
 }
 
 #if defined(ENABLE_MESSAGE_CENTER)
 message_center::MessageCenter* TestingBrowserProcess::message_center() {
-#if defined(USE_ASH)
-    return ash::Shell::GetInstance()->message_center();
-#else
-  if (!message_center_.get())
-    message_center_.reset(new message_center::MessageCenter());
-  return message_center_.get();
-#endif
+  return message_center::MessageCenter::Get();
 }
 #endif
 
 IntranetRedirectDetector* TestingBrowserProcess::intranet_redirect_detector() {
   return NULL;
 }
 
 AutomationProviderList* TestingBrowserProcess::GetAutomationProviderList() {
   return NULL;
 }
@@ skipping 171 matching lines @@
 #endif
 }
 
 void TestingBrowserProcess::SetSafeBrowsingService(
     SafeBrowsingService* sb_service) {
 #if !defined(OS_IOS)
   NOTIMPLEMENTED();
   sb_service_ = sb_service;
 #endif
 }