Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab

5 files changed, 24 insertions, 18 deletions

diff --git a/chrome/installer/linux/debian/expected_deps b/chrome/installer/linux/debian/expected_deps
index 38aff49fcf..ec92bc99f9 100644
--- a/chrome/installer/linux/debian/expected_deps
+++ b/chrome/installer/linux/debian/expected_deps
@@ -11,7 +11,7 @@ libfreetype6 (>= 2.3.9)
 libgcc1 (>= 1:4.1.1)
 libgconf-2-4 (>= 2.31.1)
 libgdk-pixbuf2.0-0 (>= 2.22.0)
-libglib2.0-0 (>= 2.26.0)
+libglib2.0-0 (>= 2.28.0)
 libgtk2.0-0 (>= 2.24.0)
 libnspr4 (>= 1.8.0.10)
 libnss3 (>= 3.14.3)
diff --git a/chrome/installer/linux/rpm/build.sh b/chrome/installer/linux/rpm/build.sh
index a312f5e5e9..6597b9961c 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -18,7 +18,7 @@ gen_spec() {
   # Trunk packages need to install to a custom path so they don't conflict with
   # release channel packages.
   local PACKAGE_FILENAME="${PACKAGE}"
-  if [ "$CHANNEL" = "trunk" ] || [ "$CHANNEL" = "asan" ]; then
+  if [ "$CHANNEL" != "stable" ]; then
     local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
     PACKAGE_FILENAME="${PACKAGE}-${CHANNEL}"
     local MENUNAME="${MENUNAME} (${CHANNEL})"
@@ -47,15 +47,8 @@ stage_install_rpm() {
     local DEFAULT_FLAGS="--user-data-dir=\"${SXS_USER_DATA_DIR}\""
 
     # Avoid file collisions between channels.
-    # TODO(phajdan.jr): Do that for all packages for SxS,
-    # http://crbug.com/38598 .
-    # We can't do this for now for all packages because of
-    # http://crbug.com/295103 , and ultimately http://crbug.com/22703 .
-    # Also see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/DBEqOORaRiw/pE0bNI6h0kcJ .
-    if [ "$CHANNEL" = "trunk" ] || [ "$CHANNEL" = "asan" ]; then
-      local PACKAGE="${PACKAGE}-${CHANNEL}"
-      local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
-    fi
+    local PACKAGE="${PACKAGE}-${CHANNEL}"
+    local INSTALLDIR="${INSTALLDIR}-${CHANNEL}"
 
     # Make it possible to distinguish between menu entries
     # for different channels.
@@ -188,19 +181,23 @@ verify_channel() {
   case $CHANNEL in
     stable )
       CHANNEL=stable
-      REPLACES="unstable beta"
+      # TODO(phajdan.jr): Remove REPLACES completely.
+      REPLACES="dummy"
       ;;
     unstable|dev|alpha )
       CHANNEL=unstable
-      REPLACES="stable beta"
+      # TODO(phajdan.jr): Remove REPLACES completely.
+      REPLACES="dummy"
       ;;
     testing|beta )
       CHANNEL=beta
-      REPLACES="unstable stable"
+      # TODO(phajdan.jr): Remove REPLACES completely.
+      REPLACES="dummy"
       ;;
     trunk|asan )
       # This is a special package, mostly for development testing, so don't make
       # it replace any installed release packages.
+      # TODO(phajdan.jr): Remove REPLACES completely.
       REPLACES="dummy"
       # Setting this to empty will prevent it from updating any existing configs
       # from release packages.
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index d6f9145880..c5b8c0fff2 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -1468,10 +1468,10 @@ InstallStatus InstallProductsHelper(
                               unpack_path.value(),
                               NULL)) {
     installer_state.WriteInstallerResult(
-        UNCOMPRESSION_FAILED,
+        UNPACKING_FAILED,
         IDS_INSTALL_UNCOMPRESSION_FAILED_BASE,
         NULL);
-    return UNCOMPRESSION_FAILED;
+    return UNPACKING_FAILED;
   }
 
   VLOG(1) << "unpacked to " << unpack_path.value();
diff --git a/chrome/installer/util/run_all_unittests.cc b/chrome/installer/util/run_all_unittests.cc
index faa57e6238..3e1f5e4184 100644
--- a/chrome/installer/util/run_all_unittests.cc
+++ b/chrome/installer/util/run_all_unittests.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/bind.h"
+#include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
 #include "base/win/scoped_com_initializer.h"
 #include "chrome/common/chrome_paths.h"
@@ -13,5 +15,10 @@ int main(int argc, char** argv) {
   chrome::RegisterPathProvider();
 
   base::win::ScopedCOMInitializer com_initializer;
-  return com_initializer.succeeded() ? test_suite.Run() : -1;
+  if (!com_initializer.succeeded())
+    return -1;
+  return base::LaunchUnitTests(
+      argc,
+      argv,
+      base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite)));
 }
diff --git a/chrome/installer/util/util_constants.h b/chrome/installer/util/util_constants.h
index 09416e4a7e..d2f648aa59 100644
--- a/chrome/installer/util/util_constants.h
+++ b/chrome/installer/util/util_constants.h
@@ -92,13 +92,15 @@ enum InstallStatus {
   CPU_NOT_SUPPORTED,           // 54. Current OS not supported
   REENABLE_UPDATES_SUCCEEDED,  // 55. Autoupdates are now enabled.
   REENABLE_UPDATES_FAILED,     // 56. Autoupdates could not be enabled.
+  UNPACKING_FAILED,            // 57. Unpacking the (possibly patched)
+                               // uncompressed archive failed.
 
   // Friendly reminder: note the COMPILE_ASSERT below.
 };
 
 
 // Existing InstallStatus values must not change.  Always add to the end.
-COMPILE_ASSERT(installer::REENABLE_UPDATES_FAILED == 56,
+COMPILE_ASSERT(installer::UNPACKING_FAILED == 57,
                dont_change_enum);
 
 // The type of an update archive.