Bug 1257039: Remove the worker descriptor for FileReaderSync. r=bz

dom/bindings/Bindings.conf

@@ -505,7 +505,6 @@ DOMInterfaces = {
 },
 
 'FileReaderSync': {
-    'workers': True,
     'wrapperCache': False,
 },
 

dom/workers/FileReaderSync.cpp

@@ -27,7 +27,6 @@
 
 #include "RuntimeService.h"
 
-USING_WORKERS_NAMESPACE
 using namespace mozilla;
 using namespace mozilla::dom;
 using mozilla::dom::Optional;
@@ -47,7 +46,7 @@ FileReaderSync::WrapObject(JSContext* aCx,
                            JS::Handle<JSObject*> aGivenProto,
                            JS::MutableHandle<JSObject*> aReflector)
 {
-  return FileReaderSyncBinding_workers::Wrap(aCx, this, aGivenProto, aReflector);
+  return FileReaderSyncBinding::Wrap(aCx, this, aGivenProto, aReflector);
 }
 
 void

dom/workers/FileReaderSync.h

@@ -4,8 +4,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef mozilla_dom_workers_filereadersync_h__
+#ifndef mozilla_dom_filereadersync_h__
-#define mozilla_dom_workers_filereadersync_h__
+#define mozilla_dom_filereadersync_h__
 
 #include "Workers.h"
 
@@ -18,10 +18,6 @@ namespace dom {
 class Blob;
 class GlobalObject;
 template<typename> class Optional;
-} // namespace dom
-} // namespace mozilla
-
-BEGIN_WORKERS_NAMESPACE
 
 class FileReaderSync final
 {
@@ -51,6 +47,7 @@ public:
   void ReadAsDataURL(Blob& aBlob, nsAString& aResult, ErrorResult& aRv);
 };
 
-END_WORKERS_NAMESPACE
+} // namespace dom
+} // namespace mozilla
 
-#endif // mozilla_dom_workers_filereadersync_h__
+#endif // mozilla_dom_filereadersync_h__

dom/workers/moz.build

@@ -6,6 +6,7 @@
 
 # Public stuff.
 EXPORTS.mozilla.dom += [
+    'FileReaderSync.h',
     'ServiceWorkerCommon.h',
     'ServiceWorkerContainer.h',
     'ServiceWorkerEvents.h',
@@ -29,7 +30,6 @@ EXPORTS.mozilla.dom.workers += [
 EXPORTS.mozilla.dom.workers.bindings += [
     'DataStore.h',
     'DataStoreCursor.h',
-    'FileReaderSync.h',
     'Navigator.h',
     'Performance.h',
     'ServiceWorker.h',