Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

components/test_runner/test_runner.cc

 // Copyright 2014 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 "components/test_runner/test_runner.h"
 
 #include <stddef.h>
 #include <limits>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #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/layout_dump.h"
 #include "components/test_runner/mock_credential_manager_client.h"
 #include "components/test_runner/mock_screen_orientation_client.h"
 #include "components/test_runner/mock_web_speech_recognizer.h"
-#include "components/test_runner/mock_web_user_media_client.h"
 #include "components/test_runner/test_interfaces.h"
 #include "components/test_runner/test_preferences.h"
 #include "components/test_runner/web_content_settings.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_test_proxy.h"
 #include "gin/arguments.h"
 #include "gin/array_buffer.h"
 #include "gin/handle.h"
 #include "gin/object_template_builder.h"
 #include "gin/wrappable.h"
@@ skipping 1629 matching lines @@
     : test_is_running_(false),
       close_remaining_windows_(false),
       work_queue_(this),
       web_history_item_count_(0),
       intercept_post_message_(false),
       test_interfaces_(interfaces),
       delegate_(nullptr),
       web_view_(nullptr),
       web_content_settings_(new WebContentSettings()),
       mock_screen_orientation_client_(new MockScreenOrientationClient),
-      chooser_count_(0),
       weak_factory_(this) {}
 
 TestRunner::~TestRunner() {}
 
 void TestRunner::Install(WebFrame* frame) {
   TestRunnerBindings::Install(weak_factory_.GetWeakPtr(), frame);
 }
 
 void TestRunner::SetDelegate(WebTestDelegate* delegate) {
   delegate_ = delegate;
@@ skipping 74 matching lines @@
   midi_accessor_result_ = true;
   should_stay_on_page_after_handling_before_unload_ = false;
   should_dump_resource_priorities_ = false;
   has_custom_text_output_ = false;
   custom_text_output_.clear();
 
   http_headers_to_clear_.clear();
 
   platform_name_ = "chromium";
   tooltip_text_ = std::string();
-  chooser_count_ = 0;
   web_history_item_count_ = 0;
   intercept_post_message_ = false;
 
   web_content_settings_->Reset();
 
   SetUseMockTheme(true);
 
   pointer_locked_ = false;
   pointer_lock_planned_result_ = PointerLockWillSucceed;
 
@@ skipping 733 matching lines @@
   // absolute
   orientation.absolute = absolute;
 
   delegate_->SetDeviceOrientationData(orientation);
 }
 
 MockScreenOrientationClient* TestRunner::getMockScreenOrientationClient() {
   return mock_screen_orientation_client_.get();
 }
 
-MockWebUserMediaClient* TestRunner::getMockWebUserMediaClient() {
-  if (!user_media_client_.get())
-    user_media_client_.reset(new MockWebUserMediaClient(delegate_));
-  return user_media_client_.get();
-}
-
 void TestRunner::SetMockScreenOrientation(const std::string& orientation_str) {
   blink::WebScreenOrientationType orientation;
 
   if (orientation_str == "portrait-primary") {
     orientation = WebScreenOrientationPortraitPrimary;
   } else if (orientation_str == "portrait-secondary") {
     orientation = WebScreenOrientationPortraitSecondary;
   } else if (orientation_str == "landscape-primary") {
     orientation = WebScreenOrientationLandscapePrimary;
   } else {
     DCHECK_EQ("landscape-secondary", orientation_str);
     orientation = WebScreenOrientationLandscapeSecondary;
   }
 
   // TODO(lukasza): This is broken for OOPIFs.
   WebLocalFrame* main_frame = web_view_->mainFrame()->toWebLocalFrame();
   mock_screen_orientation_client_->UpdateDeviceOrientation(
       main_frame, orientation);
 }
 
 void TestRunner::DisableMockScreenOrientation() {
   mock_screen_orientation_client_->SetDisabled(true);
 }
 
-void TestRunner::DidOpenChooser() {
-  chooser_count_++;
-}
-
-void TestRunner::DidCloseChooser() {
-  chooser_count_--;
-}
-
 void TestRunner::DidAcquirePointerLock() {
   DidAcquirePointerLockInternal();
 }
 
 void TestRunner::DidNotAcquirePointerLock() {
   DidNotAcquirePointerLockInternal();
 }
 
 void TestRunner::DidLosePointerLock() {
   DidLosePointerLockInternal();
@@ skipping 289 matching lines @@
       signals->issuedNonGetFetchFromScript() ? "true" : "false");
   if (delegate_)
     delegate_->PrintMessage(message);
 }
 
 void TestRunner::CloseWebInspector() {
   delegate_->CloseDevTools();
 }
 
 bool TestRunner::IsChooserShown() {
-  return 0 < chooser_count_;
+  return proxy_->IsChooserShown();
 }
 
 void TestRunner::EvaluateInWebInspector(int call_id,
                                         const std::string& script) {
   delegate_->EvaluateInWebInspector(call_id, script);
 }
 
 std::string TestRunner::EvaluateInWebInspectorOverlay(
     const std::string& script) {
   return delegate_->EvaluateInWebInspectorOverlay(script);
@@ skipping 360 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace test_runner