Backed out changeset 19320abf76b1 (bug 1207088) for Werror bustage CLOSED TREE

dom/html/HTMLInputElement.cpp

@@ -4850,9 +4850,6 @@ HTMLInputElement::ChooseDirectory(ErrorResult& aRv)
     aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR);
     return;
   }
-  // Script can call this method directly, so even though we don't show the
-  // "Pick Folder..." button on platforms that don't have a directory picker
-  // we have to redirect to the file picker here.
   InitFilePicker(
 #if defined(ANDROID) || defined(MOZ_B2G)
                  // No native directory picker - redirect to plain file picker

layout/forms/nsFileControlFrame.cpp

@@ -128,13 +128,8 @@ nsFileControlFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
   nsCOMPtr<nsIDocument> doc = mContent->GetComposedDoc();
 
   nsIContent* content = GetContent();
-  bool isDirPicker =
-#if defined(ANDROID) || defined(MOZ_B2G)
-    false;
-#else
-    Preferences::GetBool("dom.input.dirpicker", false) &&
-                         content && content->HasAttr(kNameSpaceID_None, nsGkAtoms::directory);
-#endif
+  bool isDirPicker = Preferences::GetBool("dom.input.dirpicker", false) &&
+                     content && content->HasAttr(kNameSpaceID_None, nsGkAtoms::directory);
 
   nsRefPtr<HTMLInputElement> fileContent = HTMLInputElement::FromContentOrNull(mContent);