Moving remaining mocks from WebTestProxyBase into TestRunner.

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/pixel_dump.h"
+#include "components/test_runner/spell_check_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 @@
 TestRunner::TestRunner(TestInterfaces* interfaces)
     : 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()),
+      credential_manager_client_(new MockCredentialManagerClient),
       mock_screen_orientation_client_(new MockScreenOrientationClient),
+      spellcheck_(new SpellCheckClient(this)),
       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;
   web_content_settings_->SetDelegate(delegate);
+  spellcheck_->SetDelegate(delegate);
   if (speech_recognizer_)
     speech_recognizer_->SetDelegate(delegate);
 }
 
 void TestRunner::SetWebView(WebView* webView, WebTestProxyBase* proxy) {
   web_view_ = webView;
   proxy_ = proxy;
 }
 
 void TestRunner::Reset() {
@@ skipping 246 matching lines @@
 }
 
 bool TestRunner::shouldDumpResourceResponseMIMETypes() const {
   return test_is_running_ && dump_resource_response_mime_types_;
 }
 
 WebContentSettingsClient* TestRunner::GetWebContentSettings() const {
   return web_content_settings_.get();
 }
 
+void TestRunner::InitializeWebViewWithMocks(blink::WebView* web_view) {
+  web_view->setSpellCheckClient(spellcheck_.get());
+  web_view->setCredentialManagerClient(credential_manager_client_.get());
+}
+
 bool TestRunner::shouldDumpStatusCallbacks() const {
   return dump_window_status_changes_;
 }
 
 bool TestRunner::shouldDumpSpellCheckCallbacks() const {
   return dump_spell_check_callbacks_;
 }
 
 bool TestRunner::ShouldDumpBackForwardList() const {
   return dump_back_forward_list_;
@@ skipping 1110 matching lines @@
 }
 
 bool TestRunner::WasMockSpeechRecognitionAborted() {
   return getMockWebSpeechRecognizer()->WasAborted();
 }
 
 void TestRunner::AddMockCredentialManagerResponse(const std::string& id,
                                                   const std::string& name,
                                                   const std::string& avatar,
                                                   const std::string& password) {
-  proxy_->GetCredentialManagerClientMock()->SetResponse(
-      new WebPasswordCredential(WebString::fromUTF8(id),
-                                WebString::fromUTF8(password),
-                                WebString::fromUTF8(name),
-                                WebURL(GURL(avatar))));
+  credential_manager_client_->SetResponse(new WebPasswordCredential(
+      WebString::fromUTF8(id), WebString::fromUTF8(password),
+      WebString::fromUTF8(name), WebURL(GURL(avatar))));
 }
 
 void TestRunner::AddMockCredentialManagerError(const std::string& error) {
-  proxy_->GetCredentialManagerClientMock()->SetError(error);
+  credential_manager_client_->SetError(error);
 }
 
 void TestRunner::AddWebPageOverlay() {
   if (web_view_)
     web_view_->setPageOverlayColor(SK_ColorCYAN);
 }
 
 void TestRunner::RemoveWebPageOverlay() {
   if (web_view_)
     web_view_->setPageOverlayColor(SK_ColorTRANSPARENT);
@@ skipping 204 matching lines @@
 }
 
 void TestRunner::DidLosePointerLockInternal() {
   bool was_locked = pointer_locked_;
   pointer_locked_ = false;
   if (was_locked)
     web_view_->didLosePointerLock();
 }
 
 }  // namespace test_runner