Extract WebFrameClient implementation out of WebTestProxyBase.

components/test_runner/mock_color_chooser.h

Index: components/test_runner/mock_color_chooser.h
diff --git a/components/test_runner/mock_color_chooser.h b/components/test_runner/mock_color_chooser.h
index 0948aae8515203c74f65843ef3ced123fbc53918..7ff492017bf94b09840b840fe9c72a8603c44bad 100644
--- a/components/test_runner/mock_color_chooser.h
+++ b/components/test_runner/mock_color_chooser.h
@@ -12,30 +12,34 @@
 
 namespace test_runner {
 
+class TestRunner;
 class WebTestDelegate;
-class WebTestProxyBase;
 
 class MockColorChooser : public blink::WebColorChooser {
-public:
-    MockColorChooser(blink::WebColorChooserClient* client,
-                     WebTestDelegate* delegate,
-                     WebTestProxyBase* proxy);
-    ~MockColorChooser() override;
-
-    // blink::WebColorChooser implementation.
-    void setSelectedColor(const blink::WebColor color) override;
-    void endChooser() override;
-
-    void InvokeDidEndChooser();
-    WebTaskList* mutable_task_list() { return &task_list_; }
-
-private:
-    blink::WebColorChooserClient* client_;
-    WebTestDelegate* delegate_;
-    WebTestProxyBase* proxy_;
-    WebTaskList task_list_;
-
-    DISALLOW_COPY_AND_ASSIGN(MockColorChooser);
+ public:
+  // Caller has to guarantee that |client| and |delegate| are alive
+  // until |WebColorChooserClient::didEndChooser| is called.
+  // Caller has to guarantee that |test_runner| lives longer
+  // than MockColorChooser.
+  MockColorChooser(blink::WebColorChooserClient* client,
+                   WebTestDelegate* delegate,
+                   TestRunner* test_runner);
+  ~MockColorChooser() override;
+
+  // blink::WebColorChooser implementation.
+  void setSelectedColor(const blink::WebColor color) override;
+  void endChooser() override;
+
+  void InvokeDidEndChooser();
+  WebTaskList* mutable_task_list() { return &task_list_; }
+
+ private:
+  blink::WebColorChooserClient* client_;
+  WebTestDelegate* delegate_;
+  TestRunner* test_runner_;
+  WebTaskList task_list_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockColorChooser);
 };
 
 }  // namespace test_runner