Revert 81277 - Profile shouldn't own DesktopNotificationService.DesktopNotificationService is now...

chrome/test/testing_profile.h

 // 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.
 
 #ifndef CHROME_TEST_TESTING_PROFILE_H_
 #define CHROME_TEST_TESTING_PROFILE_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_temp_dir.h"
 #include "base/timer.h"
 #include "chrome/browser/profiles/profile.h"
 
 namespace history {
 class TopSites;
 }
 
 namespace net {
 class CookieMonster;
 }
 
 namespace quota {
 class SpecialStoragePolicy;
 }
 
 class AutocompleteClassifier;
 class BookmarkModel;
 class CommandLine;
+class DesktopNotificationService;
 class ExtensionPrefs;
 class ExtensionPrefStore;
 class ExtensionPrefValueMap;
 class ExtensionSpecialStoragePolicy;
 class FaviconService;
 class FindBarState;
 class GeolocationContentSettingsMap;
 class GeolocationPermissionContext;
 class HistoryService;
 class HostContentSettingsMap;
@@ skipping 82 matching lines @@
 
   // Creates an ExtensionService initialized with the testing profile and
   // returns it. The profile keeps its own copy of a scoped_refptr to the
   // ExtensionService to make sure that is still alive to be notified when the
   // profile is destroyed.
   ExtensionService* CreateExtensionService(const CommandLine* command_line,
                                            const FilePath& install_directory);
 
   TestingPrefService* GetTestingPrefService();
 
+  void SetProfileDependencyManager(ProfileDependencyManager* manager);
+
   virtual ProfileId GetRuntimeId();
 
   virtual FilePath GetPath();
 
   // Sets whether we're incognito. Default is false.
   void set_incognito(bool incognito) {
     incognito_ = incognito;
   }
   virtual bool IsOffTheRecord();
   // Assumes ownership.
@@ skipping 98 matching lines @@
   virtual SpellCheckHost* GetSpellCheckHost();
   virtual void ReinitializeSpellCheckHost(bool force) { }
   virtual WebKitContext* GetWebKitContext();
   virtual WebKitContext* GetOffTheRecordWebKitContext();
   virtual void MarkAsCleanShutdown() {}
   virtual void InitExtensions() {}
   virtual void InitPromoResources() {}
   virtual void InitRegisteredProtocolHandlers() {}
   virtual NTPResourceCache* GetNTPResourceCache();
 
+  virtual DesktopNotificationService* GetDesktopNotificationService();
   virtual BackgroundContentsService* GetBackgroundContentsService() const;
   virtual StatusTray* GetStatusTray();
   virtual FilePath last_selected_directory();
   virtual void set_last_selected_directory(const FilePath& path);
 #if defined(OS_CHROMEOS)
   virtual void SetupChromeOSEnterpriseExtensionObserver() {
   }
   virtual void InitChromeOSPreferences() {
   }
   virtual void ChangeAppLocale(const std::string&, AppLocaleChangedVia) {
@@ skipping 100 matching lines @@
   // Should be used only on the file thread.
   scoped_refptr<webkit_database::DatabaseTracker> db_tracker_;
 
   // WebKitContext, lazily initialized by GetWebKitContext().
   scoped_refptr<WebKitContext> webkit_context_;
 
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
   scoped_refptr<GeolocationContentSettingsMap>
       geolocation_content_settings_map_;
   scoped_refptr<GeolocationPermissionContext> geolocation_permission_context_;
+  scoped_ptr<DesktopNotificationService> desktop_notification_service_;
 
   // Find bar state.  Created lazily by GetFindBarState().
   scoped_ptr<FindBarState> find_bar_state_;
 
   FilePath last_selected_directory_;
   scoped_refptr<history::TopSites> top_sites_;  // For history and thumbnails.
 
   // The Extension Preferences. Only created if CreateExtensionService is
   // invoked.
   scoped_ptr<ExtensionPrefs> extension_prefs_;
@@ skipping 31 matching lines @@
   explicit DerivedTestingProfile(Profile* profile);
   virtual ~DerivedTestingProfile();
 
   virtual ProfileId GetRuntimeId();
 
  protected:
   Profile* original_profile_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H_