MockColorChooser

components/test_runner/test_runner.h

Index: components/test_runner/test_runner.h
diff --git a/components/test_runner/test_runner.h b/components/test_runner/test_runner.h
index efdbfb944b1f1d87494cd14d4985b401539f6e35..bc664866b24dc6ee0a0cd72db2987c760a2b6628 100644
--- a/components/test_runner/test_runner.h
+++ b/components/test_runner/test_runner.h
@@ -54,6 +54,7 @@ class SpellCheckClient;
 class TestInterfaces;
 class TestRunnerForSpecificView;
 class WebTestDelegate;
+class MockColorChooser;
 
 // TestRunner class currently has dual purpose:
 // 1. It implements |testRunner| javascript bindings for "global" / "ambient".
@@ -168,8 +169,8 @@ class TestRunner : public WebTestRunner {
   midi::mojom::Result midiAccessorResult();
 
   // Methods used by MockColorChooser:
-  void DidOpenChooser();
-  void DidCloseChooser();
+  void DidOpenChooser(MockColorChooser*);
+  void DidCloseChooser(MockColorChooser*);
 
   bool ShouldDumpConsoleMessages() const;
   bool ShouldDumpJavaScriptDialogs() const;
@@ -641,9 +642,7 @@ class TestRunner : public WebTestRunner {
   std::unique_ptr<MockWebSpeechRecognizer> speech_recognizer_;
   std::unique_ptr<MockWebUserMediaClient> user_media_client_;
   std::unique_ptr<SpellCheckClient> spellcheck_;
-
-  // Number of currently active color choosers.
-  int chooser_count_;
+  std::set<MockColorChooser*> active_color_choosers_;
 
   // Captured drag image.
   blink::WebImage drag_image_;