Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89

8 files changed, 21 insertions, 29 deletions

diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include
index 2be82dba02..a316906501 100644
--- a/chrome/installer/linux/common/installer.include
+++ b/chrome/installer/linux/common/installer.include
@@ -150,12 +150,6 @@ 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}/"
@@ -178,6 +172,8 @@ 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/build.sh b/chrome/installer/linux/rpm/build.sh
index ae4008b13b..a312f5e5e9 100755
--- a/chrome/installer/linux/rpm/build.sh
+++ b/chrome/installer/linux/rpm/build.sh
@@ -107,9 +107,8 @@ do_package() {
   # Use find-requires script to make sure the dependencies are complete
   # (especially libc and libstdc++ versions).
   # - Filter out udev to avoid libudev.so.0 vs. libudev.so.1 mismatches.
-  # - Filter out libmojo_system since that a library that we provide.
   DETECTED_DEPENDS="$(echo "${BUILDDIR}/chrome" | /usr/lib/rpm/find-requires |
-      grep -v 'udev\|libmojo_system')"
+      grep -v udev)"
 
   # Compare the expected dependency list to the generated list.
   BAD_DIFF=0
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 5c3311fd18..bb92eb25b9 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -223,17 +223,11 @@
                     '<(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 d3375fd472..ef0ccf4948 100644
--- a/chrome/installer/mini_installer.gypi
+++ b/chrome/installer/mini_installer.gypi
@@ -185,17 +185,11 @@
             '<(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 2ae6a3c675..66ab4de70d 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -29,7 +29,6 @@ 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\
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 9847c32307..c3f2f93026 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -35,6 +35,7 @@
 #include "base/win/windows_version.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/setup/archive_patch_helper.h"
 #include "chrome/installer/setup/install.h"
@@ -1697,6 +1698,9 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
   base::AtExitManager exit_manager;
   CommandLine::Init(0, NULL);
 
+  // install_util uses chrome paths.
+  chrome::RegisterPathProvider();
+
   const MasterPreferences& prefs = MasterPreferences::ForCurrentProcess();
   installer::InitInstallerLogging(prefs);
 
diff --git a/chrome/installer/util/html_dialog.h b/chrome/installer/util/html_dialog.h
index aeb845a704..c6d6a5857c 100644
--- a/chrome/installer/util/html_dialog.h
+++ b/chrome/installer/util/html_dialog.h
@@ -34,7 +34,7 @@ class HTMLDialog {
    public:
     // Called before the native window is created. Use it to pass arbitrary
     // parameters in |extra| to the rendering engine.
-    virtual void OnBeforeCreation(void** extra) = 0;
+    virtual void OnBeforeCreation(wchar_t** extra) = 0;
     // The native window has been created and is about to be visible. Use it
     // to customize the native |window| appearance.
     virtual void OnBeforeDisplay(void* window) = 0;
@@ -60,7 +60,8 @@ class HTMLDialog {
 // Factory method for the native HTML Dialog. When done with the object use
 // regular 'delete' operator to destroy the object. It might choose a
 // different underlying implementation according to the url protocol.
-HTMLDialog* CreateNativeHTMLDialog(const std::wstring& url);
+HTMLDialog* CreateNativeHTMLDialog(const std::wstring& url,
+                                   const std::wstring& param);
 
 // This class leverages HTMLDialog to create a dialog that is suitable
 // for a end-user-agreement modal dialog. The html shows a fairly standard
@@ -87,7 +88,7 @@ class EulaHTMLDialog {
  private:
   class Customizer : public HTMLDialog::CustomizationCallback {
    public:
-    virtual void OnBeforeCreation(void** extra);
+    virtual void OnBeforeCreation(wchar_t** extra);
     virtual void OnBeforeDisplay(void* window);
   };
 
diff --git a/chrome/installer/util/html_dialog_impl.cc b/chrome/installer/util/html_dialog_impl.cc
index 0f48041e38..2df4447e22 100644
--- a/chrome/installer/util/html_dialog_impl.cc
+++ b/chrome/installer/util/html_dialog_impl.cc
@@ -54,9 +54,8 @@ class HTMLDialogWin : public HTMLDialog {
     return static_cast<DialogResult>(result);
   }
 
-  // TODO(cpu): Not yet implemented.
   virtual std::wstring GetExtraResult() {
-    return std::wstring();
+    return extra_result_;
   }
 
  private:
@@ -68,6 +67,7 @@ class HTMLDialogWin : public HTMLDialog {
   static HHOOK hook_;
   static HINSTANCE mshtml_;
   static CustomizationCallback* callback_;
+  std::wstring extra_result_;
 };
 
 HTMLDialog* CreateNativeHTMLDialog(const std::wstring& url,
@@ -115,7 +115,7 @@ bool HTMLDialogWin::InternalDoDialog(CustomizationCallback* callback,
 
   wchar_t* extra_args = NULL;
   if (callback) {
-    callback->OnBeforeCreation(reinterpret_cast<void**>(&extra_args));
+    callback->OnBeforeCreation(&extra_args);
     // Sets a windows hook for this thread only.
     hook_ = ::SetWindowsHookEx(WH_GETMESSAGE, MsgFilter, NULL,
                                GetCurrentThreadId());
@@ -138,8 +138,13 @@ bool HTMLDialogWin::InternalDoDialog(CustomizationCallback* callback,
                                 &v_result);
   url_moniker->Release();
 
-  if (v_result.vt == VT_I4)
+  if (v_result.vt == VT_I4) {
     *result = v_result.intVal;
+  } else if (v_result.vt == VT_BSTR) {
+    *result = HTML_DLG_EXTRA;
+    extra_result_.assign(v_result.bstrVal, SysStringLen(v_result.bstrVal));
+  }
+
   ::VariantClear(&v_result);
 
   if (hook_) {
@@ -152,7 +157,7 @@ bool HTMLDialogWin::InternalDoDialog(CustomizationCallback* callback,
 
 // EulaHTMLDialog implementation ---------------------------------------------
 
-void EulaHTMLDialog::Customizer::OnBeforeCreation(void** extra) {
+void EulaHTMLDialog::Customizer::OnBeforeCreation(wchar_t** extra) {
 }
 
 // The customization of the window consists in removing the close button and