Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Unified Diff: chrome/browser/automation/automation_resource_message_filter.cc

Issue 16295003: Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/automation/automation_resource_message_filter.cc
diff --git a/chrome/browser/automation/automation_resource_message_filter.cc b/chrome/browser/automation/automation_resource_message_filter.cc
index 7c5d15d7d393ae6af809ddca22efe28fc7a9e828..fafded1a6d7e5bc5be940bbcee511e331d7f8817 100644
--- a/chrome/browser/automation/automation_resource_message_filter.cc
+++ b/chrome/browser/automation/automation_resource_message_filter.cc
@@ -263,7 +263,7 @@ void AutomationResourceMessageFilter::RegisterRenderViewInIOThread(
// instances. If the filter instances are different it means that a new
// automation channel (External host process) was created for this tab.
if (automation_details_iter != filtered_render_views_.Get().end() &&
- automation_details_iter->second.filter == filter) {
+ automation_details_iter->second.filter.get() == filter) {
DCHECK_GT(automation_details_iter->second.ref_count, 0);
automation_details_iter->second.ref_count++;
// The tab handle and the pending status may have changed:-
@@ -321,7 +321,7 @@ void AutomationResourceMessageFilter::ResumePendingRenderViewInIOThread(
DCHECK(automation_details_iter->second.is_pending_render_view);
AutomationResourceMessageFilter* old_filter =
- automation_details_iter->second.filter;
+ automation_details_iter->second.filter.get();
DCHECK(old_filter != NULL);
filtered_render_views_.Get()[renderer_key] =
@@ -394,7 +394,7 @@ void AutomationResourceMessageFilter::GetCookiesForUrl(
filtered_render_views_.Get().find(renderer_key));
DCHECK(automation_details_iter != filtered_render_views_.Get().end());
- DCHECK(automation_details_iter->second.filter != NULL);
+ DCHECK(automation_details_iter->second.filter.get() != NULL);
int completion_callback_id = GetNextCompletionCallbackId();
DCHECK(!ContainsKey(completion_callback_map_.Get(), completion_callback_id));
@@ -409,13 +409,14 @@ void AutomationResourceMessageFilter::GetCookiesForUrl(
completion_callback_map_.Get()[completion_callback_id] = cookie_info;
- DCHECK(automation_details_iter->second.filter != NULL);
+ DCHECK(automation_details_iter->second.filter.get() != NULL);
- if (automation_details_iter->second.filter) {
- automation_details_iter->second.filter->Send(
- new AutomationMsg_GetCookiesFromHost(
- automation_details_iter->second.tab_handle, url,
- completion_callback_id));
+ if (automation_details_iter->second.filter.get()) {
+ automation_details_iter->second.filter
+ ->Send(new AutomationMsg_GetCookiesFromHost(
+ automation_details_iter->second.tab_handle,
+ url,
+ completion_callback_id));
}
}
@@ -446,12 +447,12 @@ void AutomationResourceMessageFilter::SetCookiesForUrl(
filtered_render_views_.Get().find(RendererId(
render_process_id, render_view_id)));
DCHECK(automation_details_iter != filtered_render_views_.Get().end());
- DCHECK(automation_details_iter->second.filter != NULL);
+ DCHECK(automation_details_iter->second.filter.get() != NULL);
- if (automation_details_iter->second.filter) {
- automation_details_iter->second.filter->Send(
- new AutomationMsg_SetCookieAsync(
- automation_details_iter->second.tab_handle, url, cookie_line));
+ if (automation_details_iter->second.filter.get()) {
+ automation_details_iter->second.filter
+ ->Send(new AutomationMsg_SetCookieAsync(
+ automation_details_iter->second.tab_handle, url, cookie_line));
}
}
« no previous file with comments | « chrome/browser/automation/automation_provider.cc ('k') | chrome/browser/automation/testing_automation_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698