Revert of Add Android implementation of navigator.getInstalledRelatedApps.

content/browser/frame_host/render_frame_host_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/frame_host/render_frame_host_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 2327 matching lines @@
                                               const gfx::Rect& initial_rect,
                                               bool user_gesture) {
   delegate_->ShowCreatedWindow(GetProcess()->GetID(), pending_widget_routing_id,
                                disposition, initial_rect, user_gesture);
 }
 
 void RenderFrameHostImpl::RegisterMojoInterfaces() {
   device::GeolocationServiceContext* geolocation_service_context =
       delegate_ ? delegate_->GetGeolocationServiceContext() : NULL;
 
-#if !defined(OS_ANDROID)
-  // The default (no-op) implementation of InstalledAppProvider. On Android, the
-  // real implementation is provided in Java.
+  // The default (no-op) implementation of InstalledAppProvider.
+  // TODO(mgiuca): Implement the "real" one for Android in Java, and do not add
+  // the default one on that platform.
   GetInterfaceRegistry()->AddInterface(
       base::Bind(&InstalledAppProviderImplDefault::Create));
-#endif  // !defined(OS_ANDROID)
 
   if (geolocation_service_context) {
     // TODO(creis): Bind process ID here so that GeolocationServiceImpl
     // can perform permissions checks once site isolation is complete.
     // crbug.com/426384
     // NOTE: At shutdown, there is no guaranteed ordering between destruction of
     // this object and destruction of any GeolocationServicesImpls created via
     // the below service registry, the reason being that the destruction of the
     // latter is triggered by receiving a message that the pipe was closed from
     // the renderer side. Hence, supply the reference to this object as a weak
@@ skipping 1197 matching lines @@
     service_manager::mojom::InterfaceProviderPtr provider;
     BindInterfaceRegistryForRenderFrameHost(mojo::MakeRequest(&provider), this);
     java_interfaces_.reset(new service_manager::InterfaceProvider);
     java_interfaces_->Bind(std::move(provider));
   }
   return java_interfaces_.get();
 }
 #endif
 
 }  // namespace content