| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <windows.h> | 5 #include <windows.h> |
| 6 | 6 |
| 7 #include <fstream> | 7 #include <fstream> |
| 8 | 8 |
| 9 #include "base/base_paths.h" | 9 #include "base/base_paths.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 367 Version found_version(*installer_state.GetCurrentVersion(machine_state)); | 367 Version found_version(*installer_state.GetCurrentVersion(machine_state)); |
| 368 EXPECT_TRUE(found_version.IsValid()); | 368 EXPECT_TRUE(found_version.IsValid()); |
| 369 if (found_version.IsValid()) | 369 if (found_version.IsValid()) |
| 370 EXPECT_TRUE(current_version.Equals(found_version)); | 370 EXPECT_TRUE(current_version.Equals(found_version)); |
| 371 } | 371 } |
| 372 } | 372 } |
| 373 } | 373 } |
| 374 | 374 |
| 375 TEST_F(InstallerStateTest, InstallerResult) { | 375 TEST_F(InstallerStateTest, InstallerResult) { |
| 376 const bool system_level = true; | 376 const bool system_level = true; |
| 377 bool multi_install = false; | |
| 378 HKEY root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; | 377 HKEY root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER; |
| 379 | 378 |
| 380 RegKey key; | 379 RegKey key; |
| 381 std::wstring launch_cmd = L"hey diddle diddle"; | 380 std::wstring launch_cmd = L"hey diddle diddle"; |
| 382 std::wstring value; | 381 std::wstring value; |
| 383 DWORD dw_value; | 382 DWORD dw_value; |
| 384 | 383 |
| 385 // check results for a fresh install of single Chrome | 384 // check results for a fresh install of single Chrome |
| 386 { | 385 { |
| 387 RegistryOverrideManager override_manager; | 386 RegistryOverrideManager override_manager; |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 817 // Critical update newer than the new version. | 816 // Critical update newer than the new version. |
| 818 EXPECT_FALSE( | 817 EXPECT_FALSE( |
| 819 installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid()); | 818 installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid()); |
| 820 EXPECT_FALSE( | 819 EXPECT_FALSE( |
| 821 installer_state.DetermineCriticalVersion(opv_version_, *pv_version_) | 820 installer_state.DetermineCriticalVersion(opv_version_, *pv_version_) |
| 822 .IsValid()); | 821 .IsValid()); |
| 823 EXPECT_FALSE( | 822 EXPECT_FALSE( |
| 824 installer_state.DetermineCriticalVersion(pv_version_, *pv_version_) | 823 installer_state.DetermineCriticalVersion(pv_version_, *pv_version_) |
| 825 .IsValid()); | 824 .IsValid()); |
| 826 } | 825 } |
| OLD | NEW |