Make test_runner::AppBannerClient an internal detail of components/test_runner.

WebTestInterfaces::GetAppBannerClient can be removed, because
TestRunner::ResolveBeforeInstallPromptPromise can interact with
AppBannerClient directly, rather than going through WebTestDelegate.
This also means that components/test_runner/app_banner_client.h header
no longer needs to be included outside of components/test_runner.

BUG=595089

Review URL: https://codereview.chromium.org/1807643002

Cr-Commit-Position: refs/heads/master@{#381797}

components/test_runner/app_banner_client.h

@@ -26,6 +26,10 @@ class TEST_RUNNER_EXPORT AppBannerClient
       int requestId,
       blink::WebAppBannerCallbacks* callbacks) override;
 
+  // Resolve the promise associated with the beforeinstallprompt event with the
+  // given |request_id|.  The promise is resolved with a result.platform set to
+  // |platform|.  If |platform| is not empty, result.outcome will be 'accepted',
+  // otherwise it will be 'dismissed'.
   void ResolvePromise(int request_id, const std::string& platform);
 
  private:

components/test_runner/test_runner.cc

@@ -14,6 +14,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
+#include "components/test_runner/app_banner_client.h"
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
 #include "components/test_runner/test_interfaces.h"
@@ -1551,7 +1552,7 @@ void TestRunnerBindings::ResolveBeforeInstallPromptPromise(
   if (!runner_)
     return;
 
-  return runner_->ResolveBeforeInstallPromptPromise(request_id, platform);
+  runner_->ResolveBeforeInstallPromptPromise(request_id, platform);
 }
 
 std::string TestRunnerBindings::PlatformName() {
@@ -2934,7 +2935,7 @@ void TestRunner::DispatchBeforeInstallPromptEvent(
 void TestRunner::ResolveBeforeInstallPromptPromise(
     int request_id,
     const std::string& platform) {
-  delegate_->ResolveBeforeInstallPromptPromise(request_id, platform);
+  test_interfaces_->GetAppBannerClient()->ResolvePromise(request_id, platform);
 }
 
 void TestRunner::SetPOSIXLocale(const std::string& locale) {

components/test_runner/web_test_delegate.h

@@ -279,14 +279,6 @@ class WebTestDelegate {
       const std::vector<std::string>& event_platforms,
       const base::Callback<void(bool)>& callback) = 0;
 
-  // Resolve the promise associated with the beforeinstallprompt even with
-  // request id |request_id|. The promise is resolved with a result.platform set
-  // to |platform|. If |platform| is not empty, result.outcome will be
-  // 'accepted', otherwise it will be 'dismissed'.
-  virtual void ResolveBeforeInstallPromptPromise(
-      int request_id,
-      const std::string& platform) = 0;
-
   virtual blink::WebPlugin* CreatePluginPlaceholder(
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& params) = 0;

content/shell/renderer/layout_test/blink_test_runner.cc

@@ -29,13 +29,11 @@
 #include "base/values.h"
 #include "build/build_config.h"
 #include "components/plugins/renderer/plugin_placeholder.h"
-#include "components/test_runner/app_banner_client.h"
 #include "components/test_runner/gamepad_controller.h"
 #include "components/test_runner/layout_dump.h"
 #include "components/test_runner/layout_dump_flags.h"
 #include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/test_interfaces.h"
-#include "components/test_runner/tracked_dictionary.h"
 #include "components/test_runner/web_task.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
@@ -761,14 +759,6 @@ void BlinkTestRunner::DispatchBeforeInstallPromptEvent(
   callback.Run(reply == blink::WebAppBannerPromptReply::Cancel);
 }
 
-void BlinkTestRunner::ResolveBeforeInstallPromptPromise(
-      int request_id, const std::string& platform) {
-  test_runner::WebTestInterfaces* interfaces =
-      LayoutTestRenderProcessObserver::GetInstance()->test_interfaces();
-  if (interfaces->GetAppBannerClient())
-    interfaces->GetAppBannerClient()->ResolvePromise(request_id, platform);
-}
-
 blink::WebPlugin* BlinkTestRunner::CreatePluginPlaceholder(
     blink::WebLocalFrame* frame, const blink::WebPluginParams& params) {
   if (params.mimeType != "application/x-plugin-placeholder-test")

content/shell/renderer/layout_test/blink_test_runner.h

@@ -153,9 +153,6 @@ class BlinkTestRunner : public RenderViewObserver,
       int request_id,
       const std::vector<std::string>& event_platforms,
       const base::Callback<void(bool)>& callback) override;
-  void ResolveBeforeInstallPromptPromise(
-      int request_id,
-      const std::string& platform) override;
   blink::WebPlugin* CreatePluginPlaceholder(
     blink::WebLocalFrame* frame,
     const blink::WebPluginParams& params) override;

content/shell/renderer/layout_test/layout_test_content_renderer_client.cc

@@ -7,7 +7,6 @@
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
-#include "components/test_runner/app_banner_client.h"
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/web_test_interfaces.h"
 #include "components/test_runner/web_test_proxy.h"
@@ -26,6 +25,7 @@
 #include "content/test/mock_webclipboard_impl.h"
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
+#include "third_party/WebKit/public/platform/modules/app_banner/WebAppBannerClient.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"