| Index: chrome/installer/setup/setup_util_unittest.cc
|
| diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
|
| index 6f60b590a71a66fa1787521de916b6a8a8631ba4..a78d7bb994a8b901e20bfd7efa7fe5075ebccd06 100644
|
| --- a/chrome/installer/setup/setup_util_unittest.cc
|
| +++ b/chrome/installer/setup/setup_util_unittest.cc
|
| @@ -27,12 +27,12 @@
|
| #include "base/win/registry.h"
|
| #include "base/win/scoped_handle.h"
|
| #include "base/win/windows_version.h"
|
| +#include "chrome/install_static/install_details.h"
|
| #include "chrome/installer/setup/installer_state.h"
|
| #include "chrome/installer/setup/setup_constants.h"
|
| #include "chrome/installer/setup/setup_util.h"
|
| #include "chrome/installer/util/browser_distribution.h"
|
| #include "chrome/installer/util/google_update_constants.h"
|
| -#include "chrome/installer/util/install_util.h"
|
| #include "chrome/installer/util/installation_state.h"
|
| #include "chrome/installer/util/updating_app_registration_data.h"
|
| #include "chrome/installer/util/util_constants.h"
|
| @@ -205,17 +205,9 @@ TEST(SetupUtilTest, RegisterEventLogProvider) {
|
| FILE_PATH_LITERAL("c:\\some_path\\test"));
|
| installer::RegisterEventLogProvider(install_directory, version);
|
|
|
| - // TODO(grt): use install_static::InstallDetails::Get().install_full_name()
|
| - // when InstallDetails is initialized in the installer.
|
| base::string16 reg_path(
|
| L"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\");
|
| -#if defined(GOOGLE_CHROME_BUILD)
|
| - reg_path.append(L"Chrome");
|
| - if (InstallUtil::IsChromeSxSProcess())
|
| - reg_path.append(L" SxS");
|
| -#else
|
| - reg_path.append(L"Chromium");
|
| -#endif
|
| + reg_path.append(install_static::InstallDetails::Get().install_full_name());
|
| base::win::RegKey key;
|
| ASSERT_EQ(ERROR_SUCCESS,
|
| key.Open(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ));
|
|
|