linux_aura: Revert everything; abort turning linux_aura on.

Spectacular breakages include:

- nacl integration tests constantly crashing.
- browser tests running in a busted environment.
- interactive_ui_tests being weirdly broken despite not running.
- Size regressions

BUG=125106,303342,304554,125106,304555
TBR=cpu@chromium.org,mseaborn@chromium.org,tim@chromiium.org,phajdan.jr@chromium.org,koz@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227214 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 9 insertions, 39 deletions

diff --git a/build/common.gypi b/build/common.gypi
index 94a417b..4487b19 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -75,14 +75,6 @@
               'use_aura%': 1,
             }],
 
-            # ToT Linux should be aura.
-            #
-            # TODO(erg): Merge this into the previous block once compiling with
-            # aura safely implies including ash capabilities.
-            ['OS=="linux"', {
-              'use_aura%': 1,
-            }],
-
             # Whether we're a traditional desktop unix.
             ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and chromeos==0', {
               'desktop_linux%': 1,
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index 66e0168..2f38d17 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -641,9 +641,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MutationEventsDisabled) {
 // geometry when opening new windows.
 // Originally disabled due to flakiness (see http://crbug.com/155459)
 // but now because a regression breaks the test (http://crbug.com/160343).
-//
-// TODO(erg): Now a linux_aura asan regression too: http://crbug.com/304555
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_GTK)
 #define MAYBE_ShellWindowRestorePosition DISABLED_ShellWindowRestorePosition
 #else
 #define MAYBE_ShellWindowRestorePosition ShellWindowRestorePosition
diff --git a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
index 2c08345..a188aa3 100644
--- a/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_themes_sync_test.cc
@@ -57,8 +57,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, CustomTheme) {
 
 // TCM ID - 3599303.
 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-// TODO(erg): Fails on linux_aura. See http://crbug.com/304554
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DISABLED_NativeTheme) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeTheme) {
@@ -107,8 +106,7 @@ IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DefaultTheme) {
 
 // TCM ID - 7292065.
 // TODO(sync): Fails on Chrome OS. See http://crbug.com/84575.
-// TODO(erg): Fails on linux_aura. See http://crbug.com/304554
-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
+#if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, DISABLED_NativeDefaultRace) {
 #else
 IN_PROC_BROWSER_TEST_F(TwoClientThemesSyncTest, NativeDefaultRace) {
diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps
index 9de81f0..ef2b0a27 100644
--- a/chrome/installer/linux/debian/expected_deps
+++ b/chrome/installer/linux/debian/expected_deps
@@ -1,5 +1,6 @@
 gconf-service
 libasound2 (>= 1.0.23)
+libatk1.0-0 (>= 1.12.4)
 libc6 (>= 2.11)
 libcairo2 (>= 1.6.0)
 libcups2 (>= 1.4.0)
@@ -11,7 +12,7 @@ libgcc1 (>= 1:4.1.1)
 libgconf-2-4 (>= 2.31.1)
 libgcrypt11 (>= 1.4.5)
 libgdk-pixbuf2.0-0 (>= 2.22.0)
-libglib2.0-0 (>= 2.26.0)
+libglib2.0-0 (>= 2.18.0)
 libgtk2.0-0 (>= 2.24.0)
 libnspr4 (>= 1.8.0.10)
 libnss3 (>= 3.14.3)
@@ -20,12 +21,10 @@ libstdc++6 (>= 4.6)
 libudev0 (>= 147)
 libx11-6 (>= 2:1.4.99.1)
 libxcomposite1 (>= 1:0.3-1)
-libxcursor1 (>> 1.1.2)
 libxdamage1 (>= 1:1.1)
 libxext6
-libxfixes3 (>= 1:5.0)
+libxfixes3
 libxi6 (>= 2:1.2.99.4)
-libxrandr2 (>= 2:1.2.99.2)
 libxrender1
 libxss1
 libxtst6
diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386
index a2b101e..8401dcf 100644
--- a/chrome/installer/linux/rpm/expected_deps_i386
+++ b/chrome/installer/linux/rpm/expected_deps_i386
@@ -1,6 +1,7 @@
 ld-linux.so.2
 ld-linux.so.2(GLIBC_2.3)
 libasound.so.2
+libatk-1.0.so.0
 libcairo.so.2
 libc.so.6
 libc.so.6(GLIBC_2.0)
@@ -34,7 +35,6 @@ libgconf-2.so.4
 libgcrypt.so.11
 libgdk_pixbuf-2.0.so.0
 libgdk-x11-2.0.so.0
-libgio-2.0.so.1
 libglib-2.0.so.0
 libgobject-2.0.so.0
 libgtk-x11-2.0.so.0
@@ -65,12 +65,10 @@ libstdc++.so.6(GLIBCXX_3.4.5)
 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 980c49a..bfd60cd 100644
--- a/chrome/installer/linux/rpm/expected_deps_x86_64
+++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -1,6 +1,7 @@
 ld-linux-x86-64.so.2()(64bit)
 ld-linux-x86-64.so.2(GLIBC_2.3)(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)
@@ -27,7 +28,6 @@ libgconf-2.so.4()(64bit)
 libgcrypt.so.11()(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)
 libgobject-2.0.so.0()(64bit)
 libgtk-x11-2.0.so.0()(64bit)
@@ -55,12 +55,10 @@ 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)
diff --git a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
index 6490072..f3ce99a 100644
--- a/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
+++ b/ppapi/native_client/tests/breakpad_crash_test/nacl.scons
@@ -83,13 +83,8 @@ env.AddNodeToTestSuite(
     node, ['chrome_browser_tests'], 'run_breakpad_crash_in_syscall_test',
     # This test is currently flaky on Win 32 bit on x86, disabling there.
     # See bug: https://code.google.com/p/chromium/issues/detail?id=254583
-    #
-    # These tests are also disabled on linux_aura, pending debugging of why the
-    # GPU process crashes. piman@ thinks it may be a simple flags issue.
-    # See bug: https://code.google.com/p/chromium/issues/detail?id=303342
     is_broken=env.PPAPIBrowserTesterIsBroken() or
                env.Bit('running_on_valgrind') or
-               env.Bit('host_linux') or
                (env.Bit('host_windows') and env.Bit('build_x86_32')))
 
 # Crashes in untrusted code should not produce crash dumps.
@@ -103,10 +98,5 @@ node = env.PPAPIBrowserTester(
     args=platform_args + ['--expected_crash_dumps=0'])
 env.AddNodeToTestSuite(
     node, ['chrome_browser_tests'], 'run_breakpad_untrusted_crash_test',
-    # This currently reliably fails in linux_aura configurations, probably for
-    # the same reasons that the previous test fails.
-    #
-    # See bug: https://code.google.com/p/chromium/issues/detail?id=303342
     is_broken=env.PPAPIBrowserTesterIsBroken() or
-               env.Bit('running_on_valgrind') or
-               env.Bit('host_linux'))
+               env.Bit('running_on_valgrind'))
diff --git a/tools/lsan/suppressions.txt b/tools/lsan/suppressions.txt
index cc6c360..d38d981 100644
--- a/tools/lsan/suppressions.txt
+++ b/tools/lsan/suppressions.txt
@@ -24,9 +24,6 @@ leak:crypto::ScopedTestNSSDB::ScopedTestNSSDB
 # Another leak due to not shutting down NSS properly. http://crbug.com/124445
 leak:error_get_my_stack
 
-# XRandR has several one time leaks.
-leak:libxrandr
-
 # The NSS suppressions above will not fire when the fast stack unwinder is used,
 # because it can't unwind through NSS libraries. Apply blanket supressions for now.
 leak:libnssutil3