Added window.internals.isColorChooserShown()

Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.h

Index: Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.h
diff --git a/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h b/Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.h
similarity index 70%
copy from Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h
copy to Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.h
index ec992a0699ffc2fecad49a6999249caaaa62d42c..f49f99eefb4c3fff1bc52dcf4e2270f4ed36edf6 100644
--- a/Tools/DumpRenderTree/chromium/TestRunner/src/WebUserMediaClientMock.h
+++ b/Tools/DumpRenderTree/chromium/TestRunner/src/ColorChooser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Google Inc. All rights reserved.
+ * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -28,36 +28,35 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WebUserMediaClientMock_h
-#define WebUserMediaClientMock_h
+#ifndef ColorChooser_h
+#define ColorChooser_h
 
 #include "TestCommon.h"
+#include "WebColorChooser.h"
+#include "WebColorChooserClient.h"
 #include "WebTask.h"
-#include "WebUserMediaClient.h"
-#include <public/WebCommon.h>
-#include <public/WebString.h>
-#include <public/WebURL.h>
 
 namespace WebTestRunner {
 
 class WebTestDelegate;
 
-class WebUserMediaClientMock : public WebKit::WebUserMediaClient {
+class ColorChooser : public WebKit::WebColorChooser {

[tkent, 2013/05/21 05:20:43]

I'd like to name this 'MockColorChooser.'

[Hajime Morrita, 2013/05/21 06:11:23]

Sure.

 public:
-    explicit WebUserMediaClientMock(WebTestDelegate*);
-    ~WebUserMediaClientMock() { }
+    ColorChooser(WebKit::WebColorChooserClient*, WebTestDelegate*);
+    virtual ~ColorChooser();
 
-    virtual void requestUserMedia(const WebKit::WebUserMediaRequest&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&, const WebKit::WebVector<WebKit::WebMediaStreamSource>&) OVERRIDE;
-    virtual void cancelUserMediaRequest(const WebKit::WebUserMediaRequest&);
+    // WebKit::WebColorChooser implementation.
+    virtual void setSelectedColor(const WebKit::WebColor) OVERRIDE;
+    virtual void endChooser() OVERRIDE;
 
-    // Task related methods
+    void invokeDidEndChooser();
     WebTaskList* taskList() { return &m_taskList; }
-
 private:
-    WebTaskList m_taskList;
+    WebKit::WebColorChooserClient* m_client;
     WebTestDelegate* m_delegate;
+    WebTaskList m_taskList;
 };
 
 }
 
-#endif // WebUserMediaClientMock_h
+#endif // ColorChooser_h