3 files changed, 3 insertions, 19 deletions
diff --git a/content/public/browser/browser_context.cc b/content/public/browser/browser_context.cc
index c3f931e..b8f540f 100644
--- a/content/public/browser/browser_context.cc
+++ b/content/public/browser/browser_context.cc
@@ -4,20 +4,7 @@
 
 #include "content/public/browser/browser_context.h"
 
-#include "base/logging.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
-
 namespace content {
 
-BrowserContext::~BrowserContext() {
-  NotificationService::current()->Notify(
-      content::NOTIFICATION_BROWSER_CONTEXT_DESTRUCTION,
-      content::Source<BrowserContext>(this),
-      content::NotificationService::NoDetails());
-}
 
 }  // namespace content
diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h
index 6832bec..9618315 100644
--- a/content/public/browser/browser_context.h
+++ b/content/public/browser/browser_context.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/hash_tables.h"
+#include "base/supports_user_data.h"
 #include "content/common/content_export.h"
 
 namespace fileapi {
@@ -40,9 +41,9 @@ class SpeechInputPreferences;
 
 // This class holds the context needed for a browsing session.
 // It lives on the UI thread.
-class CONTENT_EXPORT BrowserContext {
+class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
  public:
-  virtual ~BrowserContext();
+   virtual ~BrowserContext() {}
 
   // Returns the path of the directory where this context's data is stored.
   virtual FilePath GetPath() = 0;
diff --git a/content/public/browser/notification_types.h b/content/public/browser/notification_types.h
index b7b45ce..5e4fb1a 100644
--- a/content/public/browser/notification_types.h
+++ b/content/public/browser/notification_types.h
@@ -414,10 +414,6 @@ enum NotificationType {
   // of a temporary zoom level change, the details is an empty string.
   NOTIFICATION_ZOOM_LEVEL_CHANGED,
 
-  // Sent when a BrowserContext is being deleted, in case any objects want to do
-  // related cleanup. The source is the BrowserContext.
-  NOTIFICATION_BROWSER_CONTEXT_DESTRUCTION,
-
   // Custom notifications used by the embedder should start from here.
   NOTIFICATION_CONTENT_END,
 };