Index: extensions/browser/guest_view/web_view/web_view_find_helper.cc |
diff --git a/extensions/browser/guest_view/web_view/web_view_find_helper.cc b/extensions/browser/guest_view/web_view/web_view_find_helper.cc |
index 725326a8cbd28e3f9fb47fd24ba21fc8a2e65dcd..f9a315f68f3286ce67ddf9c70344a0f9b5eced80 100644 |
--- a/extensions/browser/guest_view/web_view/web_view_find_helper.cc |
+++ b/extensions/browser/guest_view/web_view/web_view_find_helper.cc |
@@ -22,12 +22,12 @@ WebViewFindHelper::~WebViewFindHelper() { |
} |
void WebViewFindHelper::CancelAllFindSessions() { |
- current_find_session_ = linked_ptr<WebViewFindHelper::FindInfo>(); |
+ current_find_session_ = nullptr; |
while (!find_info_map_.empty()) { |
find_info_map_.begin()->second->SendResponse(true /* canceled */); |
find_info_map_.erase(find_info_map_.begin()); |
} |
- if (find_update_event_.get()) |
+ if (find_update_event_) |
DispatchFindUpdateEvent(true /* canceled */, true /* final_update */); |
find_update_event_.reset(); |
} |
@@ -40,8 +40,8 @@ void WebViewFindHelper::DispatchFindUpdateEvent(bool canceled, |
args->SetBoolean(webview::kFindCanceled, canceled); |
args->SetBoolean(webview::kFindFinalUpdate, final_update); |
DCHECK(webview_guest_); |
- webview_guest_->DispatchEventToView( |
- new GuestViewEvent(webview::kEventFindReply, std::move(args))); |
+ webview_guest_->DispatchEventToView(make_scoped_ptr( |
+ new GuestViewEvent(webview::kEventFindReply, std::move(args)))); |
} |
void WebViewFindHelper::EndFindSession(int session_request_id, bool canceled) { |
@@ -100,9 +100,8 @@ void WebViewFindHelper::Find( |
std::pair<FindInfoMap::iterator, bool> insert_result = |
find_info_map_.insert(std::make_pair( |
current_find_request_id_, |
- linked_ptr< |
- WebViewFindHelper::FindInfo>(new WebViewFindHelper::FindInfo( |
- current_find_request_id_, search_text, options, find_function)))); |
+ make_scoped_refptr(new FindInfo(current_find_request_id_, search_text, |
+ options, find_function)))); |
// No duplicate insertions. |
DCHECK(insert_result.second); |
@@ -110,7 +109,7 @@ void WebViewFindHelper::Find( |
blink::WebFindOptions* full_options = insert_result.first->second->options(); |
// Set |findNext| implicitly. |
- if (current_find_session_.get()) { |
+ if (current_find_session_) { |
const base::string16& current_search_text = |
current_find_session_->search_text(); |
bool current_match_case = current_find_session_->options()->matchCase; |
@@ -122,7 +121,7 @@ void WebViewFindHelper::Find( |
} |
// Link find requests that are a part of the same find session. |
- if (full_options->findNext && current_find_session_.get()) { |
+ if (full_options->findNext && current_find_session_) { |
DCHECK(current_find_request_id_ != current_find_session_->request_id()); |
current_find_session_->AddFindNextRequest( |
insert_result.first->second->AsWeakPtr()); |
@@ -155,7 +154,7 @@ void WebViewFindHelper::FindReply(int request_id, |
return; |
// This find request must be a part of an existing find session. |
- DCHECK(current_find_session_.get()); |
+ DCHECK(current_find_session_); |
WebViewFindHelper::FindInfo* find_info = find_iterator->second.get(); |
@@ -260,9 +259,6 @@ WebViewFindHelper::FindInfo::FindInfo( |
weak_ptr_factory_(this) { |
} |
-WebViewFindHelper::FindInfo::~FindInfo() { |
-} |
- |
void WebViewFindHelper::FindInfo::AggregateResults( |
int number_of_matches, |
const gfx::Rect& selection_rect, |
@@ -289,4 +285,6 @@ void WebViewFindHelper::FindInfo::SendResponse(bool canceled) { |
find_function_->SendResponse(true); |
} |
+WebViewFindHelper::FindInfo::~FindInfo() {} |
+ |
} // namespace extensions |