Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca

4 files changed, 46 insertions, 40 deletions

diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc
index 1d5c506488..5705e244f7 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.cc
+++ b/chrome/installer/launcher_support/chrome_launcher_support.cc
@@ -45,18 +45,6 @@ const wchar_t kChromeExe[] = L"chrome.exe";
 const wchar_t kUninstallArgumentsField[] = L"UninstallArguments";
 const wchar_t kUninstallStringField[] = L"UninstallString";
 
-#ifndef OFFICIAL_BUILD
-base::FilePath GetDevelopmentExe(const wchar_t* exe_file) {
-  base::FilePath current_directory;
-  if (PathService::Get(base::DIR_EXE, &current_directory)) {
-    base::FilePath chrome_exe_path(current_directory.Append(exe_file));
-    if (base::PathExists(chrome_exe_path))
-      return chrome_exe_path;
-  }
-  return base::FilePath();
-}
-#endif
-
 // Reads a string value from the specified product's "ClientState" registry key.
 // Returns true iff the value is present and successfully read.
 bool GetClientStateValue(InstallationLevel level,
@@ -184,10 +172,6 @@ base::FilePath GetAppHostPathForInstallationLevel(InstallationLevel level) {
 
 base::FilePath GetAnyChromePath() {
   base::FilePath chrome_path;
-#ifndef OFFICIAL_BUILD
-  // For development mode, chrome.exe should be in same dir as the stub.
-  chrome_path = GetDevelopmentExe(kChromeExe);
-#endif
   if (chrome_path.empty())
     chrome_path = GetChromePathForInstallationLevel(SYSTEM_LEVEL_INSTALLATION);
   if (chrome_path.empty())
@@ -197,10 +181,6 @@ base::FilePath GetAnyChromePath() {
 
 base::FilePath GetAnyAppHostPath() {
   base::FilePath app_host_path;
-#ifndef OFFICIAL_BUILD
-  // For development mode, app_host.exe should be in same dir as chrome.exe.
-  app_host_path = GetDevelopmentExe(kChromeAppHostExe);
-#endif
   if (app_host_path.empty()) {
     app_host_path = GetAppHostPathForInstallationLevel(
         SYSTEM_LEVEL_INSTALLATION);
diff --git a/chrome/installer/launcher_support/chrome_launcher_support.h b/chrome/installer/launcher_support/chrome_launcher_support.h
index 5a948db56a..e9f62809ae 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.h
+++ b/chrome/installer/launcher_support/chrome_launcher_support.h
@@ -39,16 +39,12 @@ base::FilePath GetAppHostPathForInstallationLevel(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.
-// In non-official builds, to ease development, this will first look for a
-// chrome.exe in the same directory as the current executable.
 // The file path returned (if any) is guaranteed to exist.
 base::FilePath GetAnyChromePath();
 
 // Returns the path to an installed app_host.exe, or an empty path. Prefers a
 // system-level installation to a user-level installation. Uses Omaha client
 // state to identify a App Host installation location.
-// In non-official builds, to ease development, this will first look for a
-// app_host.exe in the same directory as the current executable.
 // The file path returned (if any) is guaranteed to exist.
 base::FilePath GetAnyAppHostPath();
 
diff --git a/chrome/installer/mini_installer.gypi b/chrome/installer/mini_installer.gypi
index 48ea25786b..ee9403cab1 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 {
   'dependencies': [
-    '<(chrome_dll_project)',
+    '<@(chrome_dll_project)',
     '../chrome.gyp:app_host',
     '../chrome.gyp:chrome',
     '../chrome.gyp:chrome_nacl_win64',
@@ -193,7 +193,7 @@
         '<(create_installer_archive_py_path)',
         '<(PRODUCT_DIR)/app_host.exe',
         '<(PRODUCT_DIR)/chrome.exe',
-        '<(chrome_dll_path)',
+        '<@(chrome_dll_path)',
         '<(PRODUCT_DIR)/nacl64.exe',
         '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
         '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
diff --git a/chrome/installer/mini_installer_syzygy.gyp b/chrome/installer/mini_installer_syzygy.gyp
index 74050ab106..6c9934720b 100644
--- a/chrome/installer/mini_installer_syzygy.gyp
+++ b/chrome/installer/mini_installer_syzygy.gyp
@@ -15,21 +15,51 @@
   ],
   'conditions': [
     # This target won't build in fastbuild, since there are no PDBs. 
-    ['OS=="win" and fastbuild==0 and chrome_multiple_dll==0', {
-      'targets': [
-        {
-          'target_name': 'mini_installer_syzygy',
-          'type': 'executable',
-          'product_name': 'mini_installer',
+    ['OS=="win" and fastbuild==0', {
+      'conditions': [
+        ['chrome_multiple_dll==0', {
+          'targets': [
+            {
+              'target_name': 'mini_installer_syzygy',
+              'type': 'executable',
+              'product_name': 'mini_installer',
 
-          'variables': {
-            'chrome_dll_project': '../chrome_syzygy.gyp:chrome_dll_syzygy',
-            'chrome_dll_path': '<(PRODUCT_DIR)/syzygy/chrome.dll',
-            'output_dir': '<(PRODUCT_DIR)/syzygy',
-          },
-          # Bulk of the build configuration comes from here.
-          'includes': [ 'mini_installer.gypi', ],
-        },
+              'variables': {
+                'chrome_dll_project': [
+                  '../chrome_syzygy.gyp:chrome_dll_syzygy',
+                ],
+                'chrome_dll_path': [
+                  '<(PRODUCT_DIR)/syzygy/chrome.dll',
+                ],
+                'output_dir': '<(PRODUCT_DIR)/syzygy',
+              },
+              # Bulk of the build configuration comes from here.
+              'includes': [ 'mini_installer.gypi', ],
+            },
+          ],
+        }, {
+          'targets': [
+            {
+              'target_name': 'mini_installer_syzygy',
+              'type': 'executable',
+              'product_name': 'mini_installer',
+
+              'variables': {
+                'chrome_dll_project': [
+                  '../chrome_syzygy.gyp:chrome_dll_syzygy',
+                  '../chrome_syzygy.gyp:chrome_child_dll_syzygy',
+                ],
+                'chrome_dll_path': [
+                  '<(PRODUCT_DIR)/syzygy/chrome.dll',
+                  '<(PRODUCT_DIR)/syzygy/chrome_child.dll',
+                ],
+                'output_dir': '<(PRODUCT_DIR)/syzygy',
+              },
+              # Bulk of the build configuration comes from here.
+              'includes': [ 'mini_installer.gypi', ],
+            },
+          ],
+        }],
       ],
     },{
       'targets': [],