Index: chrome/installer/setup/install_worker_unittest.cc |
diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc |
index 46d432a0bf0742b34345a1f5752017366bda332e..53f836356d0ef43e8ec030f4c00f2be0685a2b1e 100644 |
--- a/chrome/installer/setup/install_worker_unittest.cc |
+++ b/chrome/installer/setup/install_worker_unittest.cc |
@@ -4,12 +4,19 @@ |
#include "chrome/installer/setup/install_worker.h" |
+#include <memory> |
+#include <utility> |
#include <vector> |
+#include "base/bind.h" |
+#include "base/callback_helpers.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/version.h" |
#include "base/win/registry.h" |
#include "chrome/common/chrome_constants.h" |
+#include "chrome/install_static/install_details.h" |
+#include "chrome/install_static/install_modes.h" |
#include "chrome/installer/setup/setup_util.h" |
#include "chrome/installer/util/create_reg_key_work_item.h" |
#include "chrome/installer/util/delete_reg_key_work_item.h" |
@@ -484,6 +491,14 @@ TEST_F(InstallWorkerTest, TestInstallChromeSingleSystem) { |
EXPECT_CALL(work_item_list, AddDeleteRegKeyWorkItem(_, _, _)) |
.WillRepeatedly(Return(delete_reg_key_work_item.get())); |
+ // Install a basic InstallDetails instance and clean it up at the end. |
+ std::unique_ptr<install_static::PrimaryInstallDetails> install_details( |
+ base::MakeUnique<install_static::PrimaryInstallDetails>()); |
+ install_details->set_mode(&install_static::kInstallModes[0]); |
+ install_static::InstallDetails::SetForProcess(std::move(install_details)); |
+ base::ScopedClosureRunner install_details_resetter(base::Bind( |
+ []() { install_static::InstallDetails::SetForProcess(nullptr); })); |
+ |
AddInstallWorkItems(*installation_state.get(), |
*installer_state.get(), |
setup_path_, |