Profile shouldn't own DesktopNotificationService.

chrome/browser/profiles/profile.cc

 // Copyright (c) 2011 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/browser/profiles/profile.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
-#include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/off_the_record_profile_io_data.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/transport_security_persister.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/find_bar/find_bar_state.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
@@ skipping 461 matching lines @@
   }
 
   virtual BookmarkModel* GetBookmarkModel() {
     return profile_->GetBookmarkModel();
   }
 
   virtual ProtocolHandlerRegistry* GetProtocolHandlerRegistry() {
     return profile_->GetProtocolHandlerRegistry();
   }
 
-  virtual DesktopNotificationService* GetDesktopNotificationService() {
-    if (!desktop_notification_service_.get()) {
-      desktop_notification_service_.reset(new DesktopNotificationService(
-          this, g_browser_process->notification_ui_manager()));
-    }
-    return desktop_notification_service_.get();
-  }
-
   virtual TokenService* GetTokenService() {
     return NULL;
   }
 
   virtual ProfileSyncService* GetProfileSyncService() {
     return NULL;
   }
 
   virtual ProfileSyncService* GetProfileSyncService(
       const std::string& cros_user) {
@@ skipping 169 matching lines @@
   // Weak pointer owned by |profile_|.
   PrefService* prefs_;
 
   scoped_ptr<ExtensionProcessManager> extension_process_manager_;
 
   OffTheRecordProfileIOData::Handle io_data_;
 
   // The download manager that only stores downloaded items in memory.
   scoped_refptr<DownloadManager> download_manager_;
 
-  // Use a separate desktop notification service for OTR.
-  scoped_ptr<DesktopNotificationService> desktop_notification_service_;
-
   // We use a non-writable content settings map for OTR.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 
   // Use a separate zoom map for OTR.
   scoped_refptr<HostZoomMap> host_zoom_map_;
 
   // Use a special WebKit context for OTR browsing.
   scoped_refptr<WebKitContext> webkit_context_;
 
   // We don't want SSLHostState from the OTR profile to leak back to the main
@@ skipping 62 matching lines @@
 };
 #endif
 
 Profile* Profile::CreateOffTheRecordProfile() {
 #if defined(OS_CHROMEOS)
   if (Profile::IsGuestSession())
     return new GuestSessionProfile(this);
 #endif
   return new OffTheRecordProfileImpl(this);
 }