| 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 10 matching lines...) Expand all Loading... |
| 21 #include "base/win/registry.h" | 21 #include "base/win/registry.h" |
| 22 #include "base/win/scoped_handle.h" | 22 #include "base/win/scoped_handle.h" |
| 23 #include "chrome/common/chrome_constants.h" | 23 #include "chrome/common/chrome_constants.h" |
| 24 #include "chrome/installer/test/alternate_version_generator.h" | 24 #include "chrome/installer/test/alternate_version_generator.h" |
| 25 #include "chrome/installer/util/fake_installation_state.h" | 25 #include "chrome/installer/util/fake_installation_state.h" |
| 26 #include "chrome/installer/util/fake_product_state.h" | 26 #include "chrome/installer/util/fake_product_state.h" |
| 27 #include "chrome/installer/util/google_update_constants.h" | 27 #include "chrome/installer/util/google_update_constants.h" |
| 28 #include "chrome/installer/util/helper.h" | 28 #include "chrome/installer/util/helper.h" |
| 29 #include "chrome/installer/util/installation_state.h" | 29 #include "chrome/installer/util/installation_state.h" |
| 30 #include "chrome/installer/util/installer_state.h" | 30 #include "chrome/installer/util/installer_state.h" |
| 31 #include "chrome/installer/util/installer_util_strings.h" |
| 31 #include "chrome/installer/util/master_preferences.h" | 32 #include "chrome/installer/util/master_preferences.h" |
| 32 #include "chrome/installer/util/product_unittest.h" | 33 #include "chrome/installer/util/product_unittest.h" |
| 33 #include "chrome/installer/util/util_constants.h" | 34 #include "chrome/installer/util/util_constants.h" |
| 34 #include "chrome/installer/util/work_item.h" | 35 #include "chrome/installer/util/work_item.h" |
| 35 #include "testing/gtest/include/gtest/gtest.h" | 36 #include "testing/gtest/include/gtest/gtest.h" |
| 36 | 37 |
| 37 #include "installer_util_strings.h" // NOLINT | |
| 38 | |
| 39 using base::win::RegKey; | 38 using base::win::RegKey; |
| 40 using installer::InstallationState; | 39 using installer::InstallationState; |
| 41 using installer::InstallerState; | 40 using installer::InstallerState; |
| 42 using installer::MasterPreferences; | 41 using installer::MasterPreferences; |
| 43 using registry_util::RegistryOverrideManager; | 42 using registry_util::RegistryOverrideManager; |
| 44 | 43 |
| 45 class InstallerStateTest : public TestWithTempDirAndDeleteTempOverrideKeys { | 44 class InstallerStateTest : public TestWithTempDirAndDeleteTempOverrideKeys { |
| 46 protected: | 45 protected: |
| 47 }; | 46 }; |
| 48 | 47 |
| (...skipping 768 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 |