Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_renderer_state.cc

diff --git a/src/chrome/browser/extensions/extension_renderer_state.cc b/src/chrome/browser/extensions/extension_renderer_state.cc
index bb3621a..341db27 100644 (file)
--- a/src/chrome/browser/extensions/extension_renderer_state.cc
+++ b/src/chrome/browser/extensions/extension_renderer_state.cc
@@ -81,7 +81,7 @@ class ExtensionRendererState::TabObserver
 };
 
 ExtensionRendererState::TabObserver::TabObserver() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED,
                  content::NotificationService::AllBrowserContextsAndSources());
@@ -92,7 +92,7 @@ ExtensionRendererState::TabObserver::TabObserver() {
 }
 
 ExtensionRendererState::TabObserver::~TabObserver() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 void ExtensionRendererState::TabObserver::Observe(
@@ -189,21 +189,21 @@ void ExtensionRendererState::Shutdown() {
 
 void ExtensionRendererState::SetTabAndWindowId(
     int render_process_host_id, int routing_id, int tab_id, int window_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   RenderId render_id(render_process_host_id, routing_id);
   map_[render_id] = TabAndWindowId(tab_id, window_id);
 }
 
 void ExtensionRendererState::ClearTabAndWindowId(
     int render_process_host_id, int routing_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   RenderId render_id(render_process_host_id, routing_id);
   map_.erase(render_id);
 }
 
 bool ExtensionRendererState::GetTabAndWindowId(
     const  content::ResourceRequestInfo* info, int* tab_id, int* window_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   int render_process_id;
   if (info->GetProcessType() == content::PROCESS_TYPE_PLUGIN) {
     render_process_id = info->GetOriginPID();
@@ -222,7 +222,7 @@ bool ExtensionRendererState::GetTabAndWindowId(
 }
 
 bool ExtensionRendererState::IsWebViewRenderer(int render_process_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   for (WebViewInfoMap::iterator i = webview_info_map_.begin();
        i != webview_info_map_.end(); ++i) {
     if (i->first.first == render_process_id)
@@ -234,14 +234,14 @@ bool ExtensionRendererState::IsWebViewRenderer(int render_process_id) {
 void ExtensionRendererState::AddWebView(int guest_process_id,
                                         int guest_routing_id,
                                         const WebViewInfo& webview_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   RenderId render_id(guest_process_id, guest_routing_id);
   webview_info_map_[render_id] = webview_info;
 }
 
 void ExtensionRendererState::RemoveWebView(int guest_process_id,
                                            int guest_routing_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   RenderId render_id(guest_process_id, guest_routing_id);
   webview_info_map_.erase(render_id);
 }
@@ -249,7 +249,7 @@ void ExtensionRendererState::RemoveWebView(int guest_process_id,
 bool ExtensionRendererState::GetWebViewInfo(int guest_process_id,
                                             int guest_routing_id,
                                             WebViewInfo* webview_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   RenderId render_id(guest_process_id, guest_routing_id);
   WebViewInfoMap::iterator iter = webview_info_map_.find(render_id);
   if (iter != webview_info_map_.end()) {