Revert of Linux: Sort installer expectations in ASCII order. (patchset #2 id:20001 of https://codereview.chromium.org/1644313002/ )

Reason for revert:
Potentially caused Google Chrome Linux [x64] compile failures:
https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux/builds/45191
https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/7808

FAILED: cd ../../chrome; flock -- /tmp/linux_package_lock bash ../out/Release/installer/rpm/build.sh -o../out/Release -b ../out/Release -a ia32 -d google_chrome -c beta
...
ERROR: Shared library dependencies changed!
If this is intentional, please update:
chrome/installer/linux/rpm/expected_deps_i386
chrome/installer/linux/rpm/expected_deps_x86_64

Original issue's description:
> Linux: Sort installer expectations in ASCII order.
>
> Committed: https://crrev.com/e54ba1f2b08f887f1a0e8898d2dc0904bacb38c4
> Cr-Commit-Position: refs/heads/master@{#372802}

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

Review URL: https://codereview.chromium.org/1652373002

Cr-Commit-Position: refs/heads/master@{#372845}

4 files changed, 31 insertions, 31 deletions

diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
index 41296cd..d0e7f2c 100755
--- a/chrome/installer/linux/debian/build.sh
+++ b/chrome/installer/linux/debian/build.sh
@@ -279,7 +279,7 @@ echo "$DPKG_SHLIB_DEPS" | sed 's/, /\n/g' | \
 
 # Compare the expected dependency list to the generate list.
 BAD_DIFF=0
-LANG=C diff -u "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1
+diff "$SCRIPTDIR/expected_deps_$TARGETARCH" actual || BAD_DIFF=1
 if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
   echo
   echo "ERROR: Shared library dependencies changed!"
diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
index 4222e23..48989bbf 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -113,7 +113,7 @@ do_package() {
   # link-time code rewriting, but it might leave the symbol dependency in
   # place -- there are no guarantees.
   BAD_DIFF=0
-  LANG=C diff -u "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \
+  diff "$SCRIPTDIR/expected_deps_$ARCHITECTURE" \
       <(echo "${DETECTED_DEPENDS}" | grep -v '^ld-linux.*\(GLIBC_2\.3\)') \
       || BAD_DIFF=1
   if [ $BAD_DIFF -ne 0 ] && [ -z "${IGNORE_DEPS_CHANGES:-}" ]; then
diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386
index 87cdada..9e5be3c 100644
--- a/chrome/installer/linux/rpm/expected_deps_i386
+++ b/chrome/installer/linux/rpm/expected_deps_i386
@@ -1,23 +1,13 @@
 ld-linux.so.2
 ld-linux.so.2(GLIBC_2.1)
-libX11.so.6
-libXcomposite.so.1
-libXcursor.so.1
-libXdamage.so.1
-libXext.so.6
-libXfixes.so.3
-libXi.so.6
-libXrandr.so.2
-libXrender.so.1
-libXss.so.1
-libXtst.so.6
 libasound.so.2
 libatk-1.0.so.0
+libcairo.so.2
 libc.so.6
 libc.so.6(GLIBC_2.0)
 libc.so.6(GLIBC_2.1)
-libc.so.6(GLIBC_2.1.3)
 libc.so.6(GLIBC_2.11)
+libc.so.6(GLIBC_2.1.3)
 libc.so.6(GLIBC_2.2)
 libc.so.6(GLIBC_2.2.3)
 libc.so.6(GLIBC_2.3)
@@ -26,7 +16,6 @@ libc.so.6(GLIBC_2.3.4)
 libc.so.6(GLIBC_2.4)
 libc.so.6(GLIBC_2.6)
 libc.so.6(GLIBC_2.7)
-libcairo.so.2
 libcups.so.2
 libdbus-1.so.3
 libdl.so.2
@@ -39,8 +28,8 @@ libgcc_s.so.1
 libgcc_s.so.1(GCC_4.0.0)
 libgcc_s.so.1(GLIBC_2.0)
 libgconf-2.so.4
-libgdk-x11-2.0.so.0
 libgdk_pixbuf-2.0.so.0
+libgdk-x11-2.0.so.0
 libgio-2.0.so.0
 libglib-2.0.so.0
 libgmodule-2.0.so.0
@@ -72,3 +61,14 @@ libstdc++.so.6(GLIBCXX_3.4.11)
 libstdc++.so.6(GLIBCXX_3.4.14)
 libstdc++.so.6(GLIBCXX_3.4.15)
 libstdc++.so.6(GLIBCXX_3.4.9)
+libX11.so.6
+libXcomposite.so.1
+libXcursor.so.1
+libXdamage.so.1
+libXext.so.6
+libXfixes.so.3
+libXi.so.6
+libXrandr.so.2
+libXrender.so.1
+libXss.so.1
+libXtst.so.6
diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64
index df686df..9452235 100644
--- a/chrome/installer/linux/rpm/expected_deps_x86_64
+++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -1,29 +1,18 @@
 ld-linux-x86-64.so.2()(64bit)
 ld-linux-x86-64.so.2(GLIBC_2.2.5)(64bit)
-libX11.so.6()(64bit)
-libXcomposite.so.1()(64bit)
-libXcursor.so.1()(64bit)
-libXdamage.so.1()(64bit)
-libXext.so.6()(64bit)
-libXfixes.so.3()(64bit)
-libXi.so.6()(64bit)
-libXrandr.so.2()(64bit)
-libXrender.so.1()(64bit)
-libXss.so.1()(64bit)
-libXtst.so.6()(64bit)
 libasound.so.2()(64bit)
 libatk-1.0.so.0()(64bit)
+libcairo.so.2()(64bit)
 libc.so.6()(64bit)
 libc.so.6(GLIBC_2.11)(64bit)
 libc.so.6(GLIBC_2.2.5)(64bit)
-libc.so.6(GLIBC_2.3)(64bit)
 libc.so.6(GLIBC_2.3.2)(64bit)
 libc.so.6(GLIBC_2.3.4)(64bit)
+libc.so.6(GLIBC_2.3)(64bit)
 libc.so.6(GLIBC_2.4)(64bit)
 libc.so.6(GLIBC_2.6)(64bit)
 libc.so.6(GLIBC_2.7)(64bit)
 libc.so.6(GLIBC_2.9)(64bit)
-libcairo.so.2()(64bit)
 libcups.so.2()(64bit)
 libdbus-1.so.3()(64bit)
 libdl.so.2()(64bit)
@@ -35,8 +24,8 @@ libgcc_s.so.1()(64bit)
 libgcc_s.so.1(GCC_3.0)(64bit)
 libgcc_s.so.1(GCC_4.0.0)(64bit)
 libgconf-2.so.4()(64bit)
-libgdk-x11-2.0.so.0()(64bit)
 libgdk_pixbuf-2.0.so.0()(64bit)
+libgdk-x11-2.0.so.0()(64bit)
 libgio-2.0.so.0()(64bit)
 libglib-2.0.so.0()(64bit)
 libgmodule-2.0.so.0()(64bit)
@@ -58,9 +47,20 @@ librt.so.1()(64bit)
 librt.so.1(GLIBC_2.2.5)(64bit)
 libsmime3.so()(64bit)
 libstdc++.so.6()(64bit)
-libstdc++.so.6(GLIBCXX_3.4)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.10)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.11)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.14)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.15)(64bit)
+libstdc++.so.6(GLIBCXX_3.4)(64bit)
 libstdc++.so.6(GLIBCXX_3.4.9)(64bit)
+libX11.so.6()(64bit)
+libXcomposite.so.1()(64bit)
+libXcursor.so.1()(64bit)
+libXdamage.so.1()(64bit)
+libXext.so.6()(64bit)
+libXfixes.so.3()(64bit)
+libXi.so.6()(64bit)
+libXrandr.so.2()(64bit)
+libXrender.so.1()(64bit)
+libXss.so.1()(64bit)
+libXtst.so.6()(64bit)