Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / streams_private / streams_private_api.cc

diff --git a/src/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/src/chrome/browser/extensions/api/streams_private/streams_private_api.cc
index 9327399..1a1445a 100644 (file)
--- a/src/chrome/browser/extensions/api/streams_private/streams_private_api.cc
+++ b/src/chrome/browser/extensions/api/streams_private/streams_private_api.cc
@@ -4,21 +4,14 @@
 
 #include "chrome/browser/extensions/api/streams_private/streams_private_api.h"
 
-#include "base/json/json_writer.h"
 #include "base/lazy_instance.h"
-#include "base/stl_util.h"
-#include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/streams_private.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 #include "content/public/browser/stream_handle.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function_registry.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
 #include "net/http/http_response_headers.h"
 
 namespace {
@@ -55,10 +48,10 @@ StreamsPrivateAPI* StreamsPrivateAPI::Get(content::BrowserContext* context) {
 }
 
 StreamsPrivateAPI::StreamsPrivateAPI(content::BrowserContext* context)
-    : profile_(Profile::FromBrowserContext(context)), weak_ptr_factory_(this) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile_));
+    : browser_context_(context),
+      weak_ptr_factory_(this),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(browser_context_));
 }
 
 StreamsPrivateAPI::~StreamsPrivateAPI() {
@@ -66,7 +59,7 @@ StreamsPrivateAPI::~StreamsPrivateAPI() {
 
 void StreamsPrivateAPI::ExecuteMimeTypeHandler(
     const std::string& extension_id,
-    const content::WebContents* web_contents,
+    content::WebContents* web_contents,
     scoped_ptr<content::StreamHandle> stream,
     int64 expected_content_size) {
   // Create the event's arguments value.
@@ -88,13 +81,20 @@ void StreamsPrivateAPI::ExecuteMimeTypeHandler(
       new Event(streams_private::OnExecuteMimeTypeHandler::kEventName,
                 streams_private::OnExecuteMimeTypeHandler::Create(info)));
 
-  ExtensionSystem::Get(profile_)->event_router()->DispatchEventToExtension(
-      extension_id, event.Pass());
+  EventRouter::Get(browser_context_)
+      ->DispatchEventToExtension(extension_id, event.Pass());
 
   GURL url = stream->GetURL();
   streams_[extension_id][url] = make_linked_ptr(stream.release());
 }
 
+void StreamsPrivateAPI::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  streams_.erase(extension->id());
+}
+
 static base::LazyInstance<BrowserContextKeyedAPIFactory<StreamsPrivateAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
@@ -104,13 +104,4 @@ StreamsPrivateAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
-void StreamsPrivateAPI::Observe(int type,
-                                const content::NotificationSource& source,
-                                const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED) {
-    const Extension* extension =
-        content::Details<const UnloadedExtensionInfo>(details)->extension;
-    streams_.erase(extension->id());
-  }
-}
 }  // namespace extensions