Add a default content setting to the notifications service.

chrome/test/testing_profile.h

 // Copyright (c) 2010 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_
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_prefs.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/find_bar_state.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/in_process_webkit/webkit_context.h"
+#include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/pref_value_store.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "net/base/cookie_monster.h"
 
 class ProfileSyncService;
 class SessionService;
@@ skipping 224 matching lines @@
     if (webkit_context_ == NULL)
       webkit_context_ = new WebKitContext(this);
     return webkit_context_;
   }
   virtual WebKitContext* GetOffTheRecordWebKitContext() { return NULL; }
   virtual void MarkAsCleanShutdown() {}
   virtual void InitExtensions() {}
   virtual void InitWebResources() {}
   virtual NTPResourceCache* GetNTPResourceCache();
   virtual DesktopNotificationService* GetDesktopNotificationService() {
-    return NULL;
+  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));

[dhollowa, 2010/07/03 02:12:01]

nit: two space indent.

[Nico, 2010/07/03 02:18:29]

Done.

+    if (!desktop_notification_service_.get()) {
+       desktop_notification_service_.reset(new DesktopNotificationService(
+           this, NULL));
+    }
+    return desktop_notification_service_.get();
   }
   virtual BackgroundContentsService* GetBackgroundContentsService() {
     return NULL;
   }
   virtual FilePath last_selected_directory() {
     return last_selected_directory_;
   }
   virtual void set_last_selected_directory(const FilePath& path) {
     last_selected_directory_ = path;
   }
@@ skipping 78 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_;
 };
 
 // A profile that derives from another profile.  This does not actually
 // override anything except the GetRuntimeId() in order to test sharing of
 // site information.
 class DerivedTestingProfile : public TestingProfile {
  public:
   explicit DerivedTestingProfile(Profile* profile)
       : original_profile_(profile) {}
 
   virtual ProfileId GetRuntimeId() {
     return original_profile_->GetRuntimeId();
   }
 
  protected:
   Profile* original_profile_;
 };
 
 #endif  // CHROME_TEST_TESTING_PROFILE_H_