Correctly reset FP in RFHI whenever origin changes

Bug: 713364
Change-Id: Id8bb923750e20f3db6fc9358b1d44120513ac95f

CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation

Change-Id: Id8bb923750e20f3db6fc9358b1d44120513ac95f
Reviewed-on: https://chromium-review.googlesource.com/482380
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Reviewed-by: Charles Reis <creis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#466778}
RenderFrameHostImpl::GetJavaRenderFrameHost() {
  RenderFrameHostAndroid* render_frame_host_android =
      static_cast<RenderFrameHostAndroid*>(
          GetUserData(kRenderFrameHostAndroidKey));
  if (!render_frame_host_android) {
    java_interface_registry_ =
        base::MakeUnique<service_manager::InterfaceRegistry>(
            "RenderFrameHost Java");
    service_manager::mojom::InterfaceProviderPtr interface_provider_ptr;
    java_interface_registry_->set_default_binder(
        base::Bind(&RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame,
                   weak_ptr_factory_.GetWeakPtr()));
    java_interface_registry_->Bind(
        mojo::MakeRequest(&interface_provider_ptr), service_manager::Identity(),
        service_manager::InterfaceProviderSpec(), service_manager::Identity(),
        service_manager::InterfaceProviderSpec());
    render_frame_host_android =
        new RenderFrameHostAndroid(this, std::move(interface_provider_ptr));
    SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android);
  }
  return render_frame_host_android->GetJavaObject();
}

RenderFrameHostImpl::GetJavaRenderFrameHost() {
  RenderFrameHostAndroid* render_frame_host_android =
      static_cast<RenderFrameHostAndroid*>(
          GetUserData(kRenderFrameHostAndroidKey));
  if (!render_frame_host_android) {
    java_interface_registry_ =
        base::MakeUnique<service_manager::InterfaceRegistry>(
            "RenderFrameHost Java");
    service_manager::mojom::InterfaceProviderPtr interface_provider_ptr;
    java_interface_registry_->set_default_binder(
        base::Bind(&RenderFrameHostImpl::ForwardGetInterfaceToRenderFrame,
                   weak_ptr_factory_.GetWeakPtr()));
    java_interface_registry_->Bind(
        mojo::MakeRequest(&interface_provider_ptr), service_manager::Identity(),
        service_manager::InterfaceProviderSpec(), service_manager::Identity(),
        service_manager::InterfaceProviderSpec());
    render_frame_host_android =
        new RenderFrameHostAndroid(this, std::move(interface_provider_ptr));
    SetUserData(kRenderFrameHostAndroidKey, render_frame_host_android);
  }
  return render_frame_host_android->GetJavaObject();
}
