Commit 043b844c authored by Julie Jeongeun Kim's avatar Julie Jeongeun Kim Committed by Commit Bot

Get rid of ForTesting() from EmbeddedSearchClientFactoryImpl

This CL gets rid of BindNewEndpointAndPassDedicatedReceiverForTesting()
from EmbeddedSearchClientFactoryImpl which was added by [1] to replace
MakeRequestAssociatedWithDedicatedPipe() with new Mojo types.

It uses reset() instead of using DedicatedReceiver before connecting
and checks if AssociatedRemote is bound whenever it's accessed to call
interfaces.

[1] https://crrev.com/1897399

Bug: 955171
Change-Id: Ia2bf4a33d6a8d4a871ce037b96b72d03bf97f2e7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1912789
Commit-Queue: Julie Kim <jkim@igalia.com>
Reviewed-by: default avatarKen Rockot <rockot@google.com>
Reviewed-by: default avatarDan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715621}
parent c9bba144
...@@ -46,12 +46,12 @@ class EmbeddedSearchClientFactoryImpl ...@@ -46,12 +46,12 @@ class EmbeddedSearchClientFactoryImpl
DCHECK(web_contents); DCHECK(web_contents);
DCHECK(receiver); DCHECK(receiver);
// Before we are connected to a frame we throw away all messages. // Before we are connected to a frame we throw away all messages.
ignore_result(embedded_search_client_ embedded_search_client_.reset();
.BindNewEndpointAndPassDedicatedReceiverForTesting());
} }
chrome::mojom::EmbeddedSearchClient* GetEmbeddedSearchClient() override { chrome::mojom::EmbeddedSearchClient* GetEmbeddedSearchClient() override {
return embedded_search_client_.get(); return embedded_search_client_.is_bound() ? embedded_search_client_.get()
: nullptr;
} }
private: private:
...@@ -111,7 +111,8 @@ SearchIPCRouter::~SearchIPCRouter() = default; ...@@ -111,7 +111,8 @@ SearchIPCRouter::~SearchIPCRouter() = default;
void SearchIPCRouter::AutocompleteResultChanged( void SearchIPCRouter::AutocompleteResultChanged(
chrome::mojom::AutocompleteResultPtr result) { chrome::mojom::AutocompleteResultPtr result) {
if (!policy_->ShouldProcessAutocompleteResultChanged(is_active_tab_)) { if (!policy_->ShouldProcessAutocompleteResultChanged(is_active_tab_) ||
!embedded_search_client()) {
return; return;
} }
...@@ -120,19 +121,23 @@ void SearchIPCRouter::AutocompleteResultChanged( ...@@ -120,19 +121,23 @@ void SearchIPCRouter::AutocompleteResultChanged(
void SearchIPCRouter::OnNavigationEntryCommitted() { void SearchIPCRouter::OnNavigationEntryCommitted() {
++commit_counter_; ++commit_counter_;
if (!embedded_search_client())
return;
embedded_search_client()->SetPageSequenceNumber(commit_counter_); embedded_search_client()->SetPageSequenceNumber(commit_counter_);
} }
void SearchIPCRouter::SetInputInProgress(bool input_in_progress) { void SearchIPCRouter::SetInputInProgress(bool input_in_progress) {
if (!policy_->ShouldSendSetInputInProgress(is_active_tab_)) if (!policy_->ShouldSendSetInputInProgress(is_active_tab_) ||
!embedded_search_client()) {
return; return;
}
embedded_search_client()->SetInputInProgress(input_in_progress); embedded_search_client()->SetInputInProgress(input_in_progress);
} }
void SearchIPCRouter::OmniboxFocusChanged(OmniboxFocusState state, void SearchIPCRouter::OmniboxFocusChanged(OmniboxFocusState state,
OmniboxFocusChangeReason reason) { OmniboxFocusChangeReason reason) {
if (!policy_->ShouldSendOmniboxFocusChanged()) if (!policy_->ShouldSendOmniboxFocusChanged() || !embedded_search_client())
return; return;
embedded_search_client()->FocusChanged(state, reason); embedded_search_client()->FocusChanged(state, reason);
...@@ -140,22 +145,24 @@ void SearchIPCRouter::OmniboxFocusChanged(OmniboxFocusState state, ...@@ -140,22 +145,24 @@ void SearchIPCRouter::OmniboxFocusChanged(OmniboxFocusState state,
void SearchIPCRouter::SendMostVisitedInfo( void SearchIPCRouter::SendMostVisitedInfo(
const InstantMostVisitedInfo& most_visited_info) { const InstantMostVisitedInfo& most_visited_info) {
if (!policy_->ShouldSendMostVisitedInfo()) if (!policy_->ShouldSendMostVisitedInfo() || !embedded_search_client())
return; return;
embedded_search_client()->MostVisitedInfoChanged(most_visited_info); embedded_search_client()->MostVisitedInfoChanged(most_visited_info);
} }
void SearchIPCRouter::SendNtpTheme(const NtpTheme& theme) { void SearchIPCRouter::SendNtpTheme(const NtpTheme& theme) {
if (!policy_->ShouldSendNtpTheme()) if (!policy_->ShouldSendNtpTheme() || !embedded_search_client())
return; return;
embedded_search_client()->ThemeChanged(theme); embedded_search_client()->ThemeChanged(theme);
} }
void SearchIPCRouter::SendLocalBackgroundSelected() { void SearchIPCRouter::SendLocalBackgroundSelected() {
if (!policy_->ShouldSendLocalBackgroundSelected()) if (!policy_->ShouldSendLocalBackgroundSelected() ||
!embedded_search_client()) {
return; return;
}
embedded_search_client()->LocalBackgroundSelected(); embedded_search_client()->LocalBackgroundSelected();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment