Bug 1508255 - Merge js/src/.clang-format into top-level r=sylvestre

The style options now match, so remove js/src/.clang-format \o/

Depends on D12391

Differential Revision: https://phabricator.services.mozilla.com/D12392

--HG--
extra : moz-landing-system : lando

.clang-format

@@ -2,6 +2,7 @@ BasedOnStyle: Google
 
 # Prevent the loss of indentation with these macros
 MacroBlockBegin: "^\
+JS_BEGIN_MACRO|\
 NS_INTERFACE_MAP_BEGIN|\
 NS_INTERFACE_TABLE_HEAD|\
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION|\
@@ -11,6 +12,7 @@ NS_INTERFACE_TABLE_BEGIN|\
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED|\
 NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED$"
 MacroBlockEnd: "^\
+JS_END_MACRO|\
 NS_INTERFACE_MAP_END|\
 NS_IMPL_CYCLE_COLLECTION_.*_END|\
 NS_INTERFACE_TABLE_END|\
@@ -19,4 +21,3 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END_INHERITED|\
 NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED$"
 
 SortIncludes: false
-

js/src/.clang-format

@@ -1,7 +0,0 @@
-BasedOnStyle: Google
-
-# Prevent the loss of indentation with these macros
-MacroBlockBegin: "^JS_BEGIN_MACRO$"
-MacroBlockEnd: "^JS_END_MACRO$"
-
-SortIncludes: false