Commit fbd962fe authored by Rayan Kanso's avatar Rayan Kanso Committed by Commit Bot

Revert "[mojo] Enable default InstalledAppProvider binder for Android"

This reverts commit 100226ae.

Reason for revert: Broke the feature on Android. Also, the feature has been disabled on webview in crrev.com/c/2156991

Bug: 1086686

Original change's description:
> [mojo] Enable default InstalledAppProvider binder for Android
> 
> Since only Chrome binds InstalledAppProvider, but a default no-op
> behaviour is expected for other embedders (tests, WebView, WebLayer),
> this change removed the 'non-Android' condition for the default
> InstalledAppProvider binder to avoid renderer termination for the
> 'no binder found' case.
> 
> Bug: 1064644, 1064827
> Test: No crash when opening reddit.com in webview shell on an emulator
> Change-Id: Ia9e6d98f0abff94929bf10dcd778166c90907f40
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2124872
> Reviewed-by: Daniel Cheng <dcheng@chromium.org>
> Commit-Queue: Oksana Zhuravlova <oksamyt@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#755083}

TBR=dcheng@chromium.org,oksamyt@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 1064644, 1064827
Change-Id: Ie2ccdb3724abe7b28dcc461dedebb286c667f595
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2218028Reviewed-by: default avatarRayan Kanso <rayankans@chromium.org>
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#772297}
parent dd70f5ec
......@@ -87,7 +87,6 @@
#include "third_party/blink/public/mojom/indexeddb/indexeddb.mojom.h"
#include "third_party/blink/public/mojom/input/input_host.mojom.h"
#include "third_party/blink/public/mojom/insecure_input/insecure_input_service.mojom.h"
#include "third_party/blink/public/mojom/installedapp/installed_app_provider.mojom.h"
#include "third_party/blink/public/mojom/keyboard_lock/keyboard_lock.mojom.h"
#include "third_party/blink/public/mojom/loader/navigation_predictor.mojom.h"
#include "third_party/blink/public/mojom/locks/lock_manager.mojom.h"
......@@ -122,6 +121,7 @@
#include "content/public/common/content_switches.h"
#include "media/mojo/mojom/speech_recognition_service.mojom.h"
#include "third_party/blink/public/mojom/hid/hid.mojom.h"
#include "third_party/blink/public/mojom/installedapp/installed_app_provider.mojom.h"
#include "third_party/blink/public/mojom/serial/serial.mojom.h"
#endif
......@@ -676,10 +676,6 @@ void PopulateFrameBinders(RenderFrameHostImpl* host, mojo::BinderMap* map) {
base::Unretained(host)));
}
map->Add<blink::mojom::InstalledAppProvider>(
base::BindRepeating(&RenderFrameHostImpl::CreateInstalledAppProvider,
base::Unretained(host)));
#if defined(OS_ANDROID)
if (base::FeatureList::IsEnabled(features::kWebNfc)) {
map->Add<device::mojom::NFC>(base::BindRepeating(
......@@ -689,6 +685,10 @@ void PopulateFrameBinders(RenderFrameHostImpl* host, mojo::BinderMap* map) {
map->Add<blink::mojom::HidService>(base::BindRepeating(
&RenderFrameHostImpl::GetHidService, base::Unretained(host)));
map->Add<blink::mojom::InstalledAppProvider>(
base::BindRepeating(&RenderFrameHostImpl::CreateInstalledAppProvider,
base::Unretained(host)));
map->Add<blink::mojom::SerialService>(base::BindRepeating(
&RenderFrameHostImpl::BindSerialService, base::Unretained(host)));
#endif // !defined(OS_ANDROID)
......
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