Revert of Extract WebFrameClient implementation out of WebTestProxyBase.

components/test_runner/mock_color_chooser.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/mock_color_chooser.h"
 
-#include "components/test_runner/test_runner.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_test_proxy.h"
 
 namespace test_runner {
 
 namespace {
 class HostMethodTask : public WebMethodTask<MockColorChooser> {
  public:
   typedef void (MockColorChooser::*CallbackMethodType)();
   HostMethodTask(MockColorChooser* object, CallbackMethodType callback)
       : WebMethodTask<MockColorChooser>(object),
         callback_(callback) {}
 
   void RunIfValid() override { (object_->*callback_)(); }
 
  private:
   CallbackMethodType callback_;
 };
 
 } // namespace
 
 MockColorChooser::MockColorChooser(blink::WebColorChooserClient* client,
                                    WebTestDelegate* delegate,
-                                   TestRunner* test_runner)
-    : client_(client), delegate_(delegate), test_runner_(test_runner) {
-  test_runner_->DidOpenChooser();
+                                   WebTestProxyBase* proxy)
+    : client_(client),
+      delegate_(delegate),
+      proxy_(proxy) {
+  proxy_->DidOpenChooser();
 }
 
 MockColorChooser::~MockColorChooser() {
-  test_runner_->DidCloseChooser();
+  proxy_->DidCloseChooser();
 }
 
 void MockColorChooser::setSelectedColor(const blink::WebColor color) {}
 
 void MockColorChooser::endChooser() {
-  DCHECK(client_);
-  DCHECK(delegate_);
   delegate_->PostDelayedTask(
       new HostMethodTask(this, &MockColorChooser::InvokeDidEndChooser), 0);
-  delegate_ = nullptr;
 }
 
 void MockColorChooser::InvokeDidEndChooser() {
   client_->didEndChooser();
-  client_ = nullptr;
 }
 
 }  // namespace test_runner