Use InstallDetails in setup.

chrome/installer/setup/setup_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/installer/setup/setup_util_unittest.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include <memory>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process_handle.h"
 #include "base/strings/string_util.h"
 #include "base/test/histogram_tester.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/version.h"
 #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"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // The privilege tested in ScopeTokenPrivilege tests below.
 // Use SE_RESTORE_NAME as it is one of the many privileges that is available,
 // but not enabled by default on processes running at high integrity.
@@ skipping 152 matching lines @@
 TEST(SetupUtilTest, RegisterEventLogProvider) {
   registry_util::RegistryOverrideManager registry_override_manager;
   ASSERT_NO_FATAL_FAILURE(
       registry_override_manager.OverrideRegistry(HKEY_LOCAL_MACHINE));
 
   const base::Version version("1.2.3.4");
   const base::FilePath install_directory(
       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));
   EXPECT_TRUE(key.HasValue(L"CategoryCount"));
   EXPECT_TRUE(key.HasValue(L"TypesSupported"));
   EXPECT_TRUE(key.HasValue(L"CategoryMessageFile"));
   EXPECT_TRUE(key.HasValue(L"EventMessageFile"));
   EXPECT_TRUE(key.HasValue(L"ParameterMessageFile"));
   base::string16 value;
   EXPECT_EQ(ERROR_SUCCESS, key.ReadValue(L"CategoryMessageFile", &value));
@@ skipping 542 matching lines @@
   EXPECT_FALSE(HasBinariesVersionKey());
 #if defined(GOOGLE_CHROME_BUILD)
   EXPECT_FALSE(HasMultiGCFVersionKey());
   EXPECT_FALSE(HasAppLauncherVersionKey());
   EXPECT_FALSE(HasAppHostExe());
   EXPECT_FALSE(HasInstallExtensionCommand());
 #endif  // GOOGLE_CHROME_BUILD
 }
 
 }  // namespace installer