Revert of Move more sources from modules.gypi to subdirectories.

Revert of Move more sources from modules.gypi to subdirectories. (patchset #2 id:20001 of https://codereview.chromium.org/2324803006/ )

Reason for revert:
https://bugs.chromium.org/p/chromium/issues/detail?id=645621
BUG=645621
Original issue's description:
> Move more sources from modules.gypi to subdirectories.
> 
> More classes of Blink modules are moved from the deprecated modules.gypi to separate BUILD files in the module directories.
> 
> TBR=dpranke@chromium.org
> 
> Committed: https://crrev.com/9ce4e475c115bd1e473bb02f6cab81d767586ac9
> Cr-Commit-Position: refs/heads/master@{#417700}

TBR=dpranke@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

[dmurph, 2016-09-10 01:34:36]

The CQ bit was checked by dmurph@chromium.org

[dmurph, 2016-09-10 01:34:37]

Created Revert of Move more sources from modules.gypi to subdirectories.

[commit-bot: I haz the power, 2016-09-10 01:35:11]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-10 01:35:39]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-09-10 01:35:41]

Failed to apply patch for third_party/WebKit/Source/modules/BUILD.gn:
While running git apply --index -3 -p1;
  error: patch failed: third_party/WebKit/Source/modules/BUILD.gn:88
  Falling back to three-way merge...
  Applied patch to 'third_party/WebKit/Source/modules/BUILD.gn' with conflicts.
  U third_party/WebKit/Source/modules/BUILD.gn

Patch:       third_party/WebKit/Source/modules/BUILD.gn
Index: third_party/WebKit/Source/modules/BUILD.gn
diff --git a/third_party/WebKit/Source/modules/BUILD.gn
b/third_party/WebKit/Source/modules/BUILD.gn
index
d48964955b11410d5df9cc3bdd695cac525bd763..2d7960f8bfe871aba46e2d0af6cc73e64a854909
100644
--- a/third_party/WebKit/Source/modules/BUILD.gn
+++ b/third_party/WebKit/Source/modules/BUILD.gn
@@ -88,33 +88,12 @@
   deps = [
     ":make_modules_generated",
     ":module_names",
+    "//device/battery:mojo_bindings_blink",
     "//device/geolocation/public/interfaces:interfaces_blink",
     "//device/nfc:mojo_bindings_blink",
     "//media/mojo/interfaces:image_capture_blink",
     "//third_party/WebKit/Source/bindings/modules:generated",
     "//third_party/WebKit/Source/core",
-    "//third_party/WebKit/Source/modules/accessibility",
-    "//third_party/WebKit/Source/modules/app_banner",
-    "//third_party/WebKit/Source/modules/audio_output_devices",
-    "//third_party/WebKit/Source/modules/background_sync",
-    "//third_party/WebKit/Source/modules/battery",
-    "//third_party/WebKit/Source/modules/beacon",
-    "//third_party/WebKit/Source/modules/bluetooth",
-    "//third_party/WebKit/Source/modules/broadcastchannel",
-    "//third_party/WebKit/Source/modules/budget",
-    "//third_party/WebKit/Source/modules/cachestorage",
-    "//third_party/WebKit/Source/modules/canvas",
-    "//third_party/WebKit/Source/modules/canvas2d",
-    "//third_party/WebKit/Source/modules/compositorworker",
-    "//third_party/WebKit/Source/modules/credentialmanager",
-    "//third_party/WebKit/Source/modules/crypto",
-    "//third_party/WebKit/Source/modules/csspaint",
-    "//third_party/WebKit/Source/modules/device_light",
-    "//third_party/WebKit/Source/modules/device_orientation",
-    "//third_party/WebKit/Source/modules/donottrack",
-    "//third_party/WebKit/Source/modules/encoding",
-    "//third_party/WebKit/Source/modules/encryptedmedia",
-    "//third_party/WebKit/Source/modules/fetch",
     "//third_party/WebKit/Source/modules/sensor",
     "//third_party/WebKit/Source/modules/serviceworkers",
     "//third_party/WebKit/Source/modules/speech",

[brettw, 2016-09-10 02:39:06]

Should be addressed in:
https://codereview.chromium.org/2327353002/