Revert 258062 "Turns on use_mojo=1 for linux."

> Turns on use_mojo=1 for linux.
> 
> BUG=353602
> TEST=none
> R=csharp@chromium.org, mmoss@google.com, thestig@chromium.org, mmoss@chromium.org
> 
> Review URL: https://codereview.chromium.org/203963003

TBR=sky@chromium.org

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

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

10 files changed, 0 insertions, 18 deletions

diff --git a/chrome/chrome.isolate b/chrome/chrome.isolate
index 8b48e12..6a92211 100644
--- a/chrome/chrome.isolate
+++ b/chrome/chrome.isolate
@@ -9,7 +9,6 @@
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
         ],
diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi
index 3fa5a49..a11d099 100644
--- a/chrome/chrome_installer.gypi
+++ b/chrome/chrome_installer.gypi
@@ -490,7 +490,6 @@
           '<(PRODUCT_DIR)/chrome_sandbox',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/xdg-mime',
           '<(PRODUCT_DIR)/xdg-settings',
           '<(PRODUCT_DIR)/locales/en-US.pak',
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 4d006ae..9123a6e 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -150,8 +150,6 @@ stage_install_common() {
   # ffmpeg libs
   install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/"
 
-  install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDIR}/lib/"
-
   # Widevine CDM.
   if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
     install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/"
diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 871c288..3d2a109 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -15,7 +15,6 @@
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/pyproto/google/__init__.py',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
diff --git a/chrome/sync_integration_tests.isolate b/chrome/sync_integration_tests.isolate
index 8af9afa..7324cf5 100644
--- a/chrome/sync_integration_tests.isolate
+++ b/chrome/sync_integration_tests.isolate
@@ -17,7 +17,6 @@
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libppGoogleNaClPluginChrome.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/locales/en-US.pak',
           '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
diff --git a/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh
index 2fa2389..48ef6e7 100755
--- a/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh
+++ b/chrome/test/chromeos/autotest/files/client/deps/chrome_test/setup_test_links.sh
@@ -55,7 +55,6 @@ link_from_pyauto_dep \
     "$pyauto_dep_dir/test_src/out/Release/suid-python" \
     "$pyauto_dep_dir/test_src/out/Release/_pyautolib.so" \
     "$pyauto_dep_dir/test_src/out/Release/libffmpegsumo.so" \
-    "$pyauto_dep_dir/test_src/out/Release/lib/libmojo_system.so" \
     "$pyauto_dep_dir/test_src/third_party"/*
 
 # Make sure the test files are owned by chronos as some browser_tests emit
diff --git a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh
index 685333d..2be6bd2 100755
--- a/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh
+++ b/chrome/test/chromeos/autotest/files/client/deps/pyauto_dep/setup_test_links.sh
@@ -13,5 +13,3 @@ ln -f -s /opt/google/chrome/chrome $(dirname $0)/chrome
     $(dirname $0)/resources
 ln -f -s /opt/google/chrome/*.pak $(dirname $0)/
 ln -f -s /opt/google/chrome/libffmpegsumo.so $(dirname $0)/libffmpegsumo.so
-ln -f -s /opt/google/chrome/lib/libmojo_system.so \
-         $(dirname $0)/lib/libmojo_system.so
diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 9e077db..97e002a 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -57,10 +57,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'lib/libmojo_system.so',
-    'buildtype': ['dev', 'official'],
-  },
-  {
     'filename': 'lib/libpeerconnection.so',
     'buildtype': ['dev', 'official'],
     'optional': ['dev', 'official'],
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index fd547bc..7cbdc49 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -64,10 +64,6 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'lib/libmojo_system.so',
-    'buildtype': ['dev', 'official'],
-  },
-  {
     'filename': 'lib/libpeerconnection.so',
     'buildtype': ['dev', 'official'],
     'optional': ['dev', 'official'],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index 346e220..f35ecc8 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -49,7 +49,6 @@
           '../testing/xvfb.py',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
-          '<(PRODUCT_DIR)/lib/libmojo_system.so',
           '<(PRODUCT_DIR)/locales/fr.pak',
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],