Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783

8 files changed, 47 insertions, 1 deletions

diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc
index c28bf9977f..fdac65c658 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.cc
+++ b/chrome/installer/launcher_support/chrome_launcher_support.cc
@@ -38,6 +38,9 @@ const wchar_t kBinariesAppGuid[] = L"{4DC8B4CA-1BDA-483e-B5FA-D3C12E15B62D}";
 // Copied from google_chrome_distribution.cc.
 const wchar_t kBrowserAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
 
+// Copied frome google_chrome_sxs_distribution.cc.
+const wchar_t kSxSBrowserAppGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}";
+
 // Copied from util_constants.cc.
 const wchar_t kChromeAppHostExe[] = L"app_host.exe";
 const char kChromeAppLauncher[] = "app-launcher";
@@ -170,6 +173,11 @@ base::FilePath GetAppHostPathForInstallationLevel(InstallationLevel level) {
       GetSetupExeFromRegistry(level, kAppHostAppId), kChromeAppHostExe);
 }
 
+base::FilePath GetChromeSxSPathForInstallationLevel(InstallationLevel level) {
+  return FindExeRelativeToSetupExe(
+      GetSetupExeFromRegistry(level, kSxSBrowserAppGuid), kChromeExe);
+}
+
 base::FilePath GetAnyChromePath() {
   base::FilePath chrome_path;
   if (chrome_path.empty())
@@ -190,6 +198,14 @@ base::FilePath GetAnyAppHostPath() {
   return app_host_path;
 }
 
+base::FilePath GetAnyChromeSxSPath() {
+  base::FilePath path =
+      GetChromeSxSPathForInstallationLevel(USER_LEVEL_INSTALLATION);
+  if (path.empty())
+    path = GetChromeSxSPathForInstallationLevel(SYSTEM_LEVEL_INSTALLATION);
+  return path;
+}
+
 bool IsAppHostPresent() {
   base::FilePath app_host_exe = GetAnyAppHostPath();
   return !app_host_exe.empty();
diff --git a/chrome/installer/launcher_support/chrome_launcher_support.h b/chrome/installer/launcher_support/chrome_launcher_support.h
index e9f62809ae..1a8847fa81 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.h
+++ b/chrome/installer/launcher_support/chrome_launcher_support.h
@@ -36,6 +36,10 @@ base::FilePath GetChromePathForInstallationLevel(InstallationLevel level);
 // it can be found via Omaha client state.
 base::FilePath GetAppHostPathForInstallationLevel(InstallationLevel level);
 
+// Returns the path to an installed SxS chrome.exe at the specified level, if
+// it can be found via Omaha client state.
+base::FilePath GetChromeSxSPathForInstallationLevel(InstallationLevel level);
+
 // Returns the path to an installed chrome.exe, or an empty path. Prefers a
 // system-level installation to a user-level installation. Uses Omaha client
 // state to identify a Chrome installation location.
@@ -48,6 +52,12 @@ base::FilePath GetAnyChromePath();
 // The file path returned (if any) is guaranteed to exist.
 base::FilePath GetAnyAppHostPath();
 
+// Returns the path to an installed SxS chrome.exe, or an empty path. Prefers a
+// user-level installation to a system-level installation. Uses Omaha client
+// state to identify a Chrome Canary installation location.
+// The file path returned (if any) is guaranteed to exist.
+base::FilePath GetAnyChromeSxSPath();
+
 // Uninstalls the legacy app launcher by launching setup.exe with the uninstall
 // arguments from the App Launcher ClientState registry key. The uninstall will
 // run asynchronously.
diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 9123a6e0c3..616c3c4fc4 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -150,6 +150,12 @@ stage_install_common() {
   # ffmpeg libs
   install -m 644 -s "${BUILDDIR}/libffmpegsumo.so" "${STAGEDIR}/${INSTALLDIR}/"
 
+  install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
+
+  if [ -f "${BUILDDIR}/lib/libmojo_system.so" ]; then
+    install -m 644 -s "${BUILDDIR}/lib/libmojo_system.so" "${STAGEDIR}/${INSTALLDIR}/lib/"
+  fi
+
   # Widevine CDM.
   if [ -f "${BUILDDIR}/libwidevinecdmadapter.so" ]; then
     install -m 644 -s "${BUILDDIR}/libwidevinecdmadapter.so" "${STAGEDIR}/${INSTALLDIR}/"
@@ -172,7 +178,6 @@ stage_install_common() {
 
   # peerconnection shared library
   if [ -f "${BUILDDIR}/lib/libpeerconnection.so" ]; then
-    install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/lib/"
     install -m 644 -s "${BUILDDIR}/lib/libpeerconnection.so" "${STAGEDIR}/${INSTALLDIR}/lib/"
   fi
 
diff --git a/chrome/installer/linux/rpm/expected_deps_i386 b/chrome/installer/linux/rpm/expected_deps_i386
index 52fd504fc3..5683fe945b 100644
--- a/chrome/installer/linux/rpm/expected_deps_i386
+++ b/chrome/installer/linux/rpm/expected_deps_i386
@@ -39,6 +39,7 @@ libgio-2.0.so.0
 libglib-2.0.so.0
 libgobject-2.0.so.0
 libgtk-x11-2.0.so.0
+libmojo_system.so
 libm.so.6
 libm.so.6(GLIBC_2.0)
 libm.so.6(GLIBC_2.1)
diff --git a/chrome/installer/linux/rpm/expected_deps_x86_64 b/chrome/installer/linux/rpm/expected_deps_x86_64
index 1435e398b4..59ca7cb5fb 100644
--- a/chrome/installer/linux/rpm/expected_deps_x86_64
+++ b/chrome/installer/linux/rpm/expected_deps_x86_64
@@ -33,6 +33,7 @@ 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)
+libmojo_system.so()(64bit)
 libm.so.6()(64bit)
 libm.so.6(GLIBC_2.2.5)(64bit)
 libnspr4.so()(64bit)
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index bb92eb25b9..5c3311fd18 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -223,11 +223,17 @@
                     '<(PRODUCT_DIR)/icudtl.dat',
                   ],
                 }],
+                ['use_mojo==0', {
+                  'inputs!': [
+                    '<(PRODUCT_DIR)/mojo_system.dll',
+                  ],
+                }],
               ],
               'inputs': [
                 '<(create_installer_archive_py_path)',
                 '<(PRODUCT_DIR)/chrome.exe',
                 '<(PRODUCT_DIR)/chrome.dll',
+                '<(PRODUCT_DIR)/mojo_system.dll',
                 '<(PRODUCT_DIR)/nacl64.exe',
                 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index ef0ccf4948..d3375fd472 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -185,11 +185,17 @@
             '<(PRODUCT_DIR)/icudtl.dat',
           ],
         }],
+        ['use_mojo==0', {
+          'inputs!': [
+            '<(PRODUCT_DIR)/mojo_system.dll',
+          ],
+        }],
       ],
       'inputs': [
         '<(create_installer_archive_py_path)',
         '<(PRODUCT_DIR)/chrome.exe',
         '<@(chrome_dll_path)',
+        '<(PRODUCT_DIR)/mojo_system.dll',
         '<(PRODUCT_DIR)/nacl64.exe',
         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
         '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index 66ab4de70d..2ae6a3c675 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -29,6 +29,7 @@ icudt.dll: %(VersionDir)s\
 icudtl.dat: %(VersionDir)s\
 libEGL.dll: %(VersionDir)s\
 libGLESv2.dll: %(VersionDir)s\
+mojo_system.dll: %(VersionDir)s\
 nacl64.exe: %(VersionDir)s\
 nacl_irt_x86_32.nexe: %(VersionDir)s\
 nacl_irt_x86_64.nexe: %(VersionDir)s\