Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / extensions / browser / api / storage / storage_frontend.cc

diff --git a/src/extensions/browser/api/storage/storage_frontend.cc b/src/extensions/browser/api/storage/storage_frontend.cc
index 503205d..c9a6ac2 100644 (file)
--- a/src/extensions/browser/api/storage/storage_frontend.cc
+++ b/src/extensions/browser/api/storage/storage_frontend.cc
@@ -16,7 +16,6 @@
 #include "extensions/browser/api/storage/local_value_store_cache.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/extension_system.h"
 #include "extensions/common/api/storage.h"
 
 using content::BrowserContext;
@@ -49,8 +48,8 @@ class DefaultObserver : public SettingsObserver {
         settings_namespace)));
     scoped_ptr<Event> event(new Event(
         core_api::storage::OnChanged::kEventName, args.Pass()));
-    ExtensionSystem::Get(browser_context_)->event_router()->
-        DispatchEventToExtension(extension_id, event.Pass());
+    EventRouter::Get(browser_context_)
+        ->DispatchEventToExtension(extension_id, event.Pass());
   }
 
  private:
@@ -87,7 +86,7 @@ void StorageFrontend::Init(
     const scoped_refptr<SettingsStorageFactory>& factory) {
   observers_ = new SettingsObserverList();
   browser_context_observer_.reset(new DefaultObserver(browser_context_));
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!browser_context_->IsOffTheRecord());
 
   observers_->AddObserver(browser_context_observer_.get());
@@ -102,7 +101,7 @@ void StorageFrontend::Init(
 }
 
 StorageFrontend::~StorageFrontend() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   observers_->RemoveObserver(browser_context_observer_.get());
   for (CacheMap::iterator it = caches_.begin(); it != caches_.end(); ++it) {
     ValueStoreCache* cache = it->second;
@@ -128,7 +127,7 @@ void StorageFrontend::RunWithStorage(
     scoped_refptr<const Extension> extension,
     settings_namespace::Namespace settings_namespace,
     const ValueStoreCache::StorageCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CHECK(extension.get());
 
   ValueStoreCache* cache = caches_[settings_namespace];
@@ -141,7 +140,7 @@ void StorageFrontend::RunWithStorage(
 }
 
 void StorageFrontend::DeleteStorageSoon(const std::string& extension_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (CacheMap::iterator it = caches_.begin(); it != caches_.end(); ++it) {
     ValueStoreCache* cache = it->second;
     BrowserThread::PostTask(
@@ -153,7 +152,7 @@ void StorageFrontend::DeleteStorageSoon(const std::string& extension_id) {
 }
 
 scoped_refptr<SettingsObserverList> StorageFrontend::GetObservers() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return observers_;
 }