Move FileChooser.{cpp,h} to core/html/forms/.

This will enable us to simplify some code. e.g.
- Merge WebFileChooserParams and FileChooserSettings
- Merge WebFileChooserCompletion::SelectedFileInfo and
  FileChooserFileInfo


Change-Id: Id6d2982d6fae1082edaf6f7cb405b228e17227df
Reviewed-on: https://chromium-review.googlesource.com/624832Reviewed-by: Keishi Hattori <keishi@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#496588}

third_party/WebKit/Source/core/exported/WebFileChooserCompletionImpl.h

@@ -32,7 +32,7 @@
 #define WebFileChooserCompletionImpl_h
 
 #include "core/CoreExport.h"
-#include "platform/FileChooser.h"
+#include "core/html/forms/FileChooser.h"
 #include "platform/wtf/RefPtr.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebVector.h"

third_party/WebKit/Source/core/html/BUILD.gn

@@ -396,6 +396,8 @@ blink_core_sources("html") {
     "forms/ExternalDateTimeChooser.h",
     "forms/ExternalPopupMenu.cpp",
     "forms/ExternalPopupMenu.h",
+    "forms/FileChooser.cpp",
+    "forms/FileChooser.h",
     "forms/FileInputType.cpp",
     "forms/FileInputType.h",
     "forms/FormController.cpp",

third_party/WebKit/Source/core/html/HTMLInputElement.h

@@ -28,8 +28,8 @@
 #include "base/gtest_prod_util.h"
 #include "core/CoreExport.h"
 #include "core/html/TextControlElement.h"
+#include "core/html/forms/FileChooser.h"
 #include "core/html/forms/StepRange.h"
-#include "platform/FileChooser.h"
 #include "platform/bindings/ActiveScriptWrappable.h"
 
 namespace blink {

third_party/WebKit/Source/platform/FileChooser.cpp → third_party/WebKit/Source/core/html/forms/FileChooser.cpp

@@ -26,12 +26,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "platform/FileChooser.h"
+#include "core/html/forms/FileChooser.h"
 
 namespace blink {
 
-FileChooserClient::~FileChooserClient() {
-}
+FileChooserClient::~FileChooserClient() {}
 
 FileChooser* FileChooserClient::NewFileChooser(
     const FileChooserSettings& settings) {

third_party/WebKit/Source/platform/FileChooser.h → third_party/WebKit/Source/core/html/forms/FileChooser.h

@@ -31,7 +31,6 @@
 #define FileChooser_h
 
 #include "platform/FileMetadata.h"
-#include "platform/PlatformExport.h"
 #include "platform/heap/Handle.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/wtf/Allocator.h"
@@ -74,10 +73,10 @@ struct FileChooserSettings {
   CaptureFacingMode capture;
 
   // Returns a combined vector of acceptMIMETypes and acceptFileExtensions.
-  Vector<String> PLATFORM_EXPORT AcceptTypes() const;
+  Vector<String> AcceptTypes() const;
 };
 
-class PLATFORM_EXPORT FileChooserClient : public GarbageCollectedMixin {
+class FileChooserClient : public GarbageCollectedMixin {
  public:
   virtual void FilesChosen(const Vector<FileChooserFileInfo>&) = 0;
   virtual ~FileChooserClient();
@@ -89,7 +88,7 @@ class PLATFORM_EXPORT FileChooserClient : public GarbageCollectedMixin {
   RefPtr<FileChooser> chooser_;
 };
 
-class PLATFORM_EXPORT FileChooser : public RefCounted<FileChooser> {
+class FileChooser : public RefCounted<FileChooser> {
  public:
   static PassRefPtr<FileChooser> Create(FileChooserClient*,
                                         const FileChooserSettings&);

third_party/WebKit/Source/core/html/forms/FileInputType.h

@@ -33,9 +33,9 @@
 #define FileInputType_h
 
 #include "core/CoreExport.h"
+#include "core/html/forms/FileChooser.h"
 #include "core/html/forms/InputType.h"
 #include "core/html/forms/KeyboardClickableInputTypeView.h"
-#include "platform/FileChooser.h"
 #include "platform/heap/Handle.h"
 #include "platform/wtf/RefPtr.h"
 

third_party/WebKit/Source/core/html/forms/FormController.cpp

@@ -25,7 +25,7 @@
 #include "core/html/HTMLFormControlElementWithState.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLInputElement.h"
-#include "platform/FileChooser.h"
+#include "core/html/forms/FileChooser.h"
 #include "platform/wtf/Deque.h"
 #include "platform/wtf/HashTableDeletedValueType.h"
 #include "platform/wtf/PtrUtil.h"

third_party/WebKit/Source/core/loader/EmptyClients.cpp

@@ -34,8 +34,8 @@
 #include "core/html/HTMLFormElement.h"
 #include "core/html/forms/ColorChooser.h"
 #include "core/html/forms/DateTimeChooser.h"
+#include "core/html/forms/FileChooser.h"
 #include "core/loader/DocumentLoader.h"
-#include "platform/FileChooser.h"
 #include "platform/wtf/PtrUtil.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebApplicationCacheHost.h"

third_party/WebKit/Source/core/page/ChromeClientImpl.cpp

@@ -63,6 +63,7 @@
 #include "core/html/forms/DateTimeChooserImpl.h"
 #include "core/html/forms/ExternalDateTimeChooser.h"
 #include "core/html/forms/ExternalPopupMenu.h"
+#include "core/html/forms/FileChooser.h"
 #include "core/html/forms/InternalPopupMenu.h"
 #include "core/inspector/DevToolsEmulator.h"
 #include "core/layout/HitTestResult.h"
@@ -74,7 +75,6 @@
 #include "core/page/PopupOpeningObserver.h"
 #include "core/paint/compositing/CompositedSelection.h"
 #include "platform/Cursor.h"
-#include "platform/FileChooser.h"
 #include "platform/Histogram.h"
 #include "platform/LayoutTestSupport.h"
 #include "platform/RuntimeEnabledFeatures.h"

third_party/WebKit/Source/platform/BUILD.gn

@@ -286,8 +286,6 @@ component("platform") {
     "DragImage.h",
     "EventDispatchForbiddenScope.cpp",
     "EventDispatchForbiddenScope.h",
-    "FileChooser.cpp",
-    "FileChooser.h",
     "FileMetadata.cpp",
     "FileMetadata.h",
     "FileSystemType.h",