Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Side by Side Diff: chrome/installer/util/installer_state_unittest.cc

Issue 1116263002: Revert of Add installer_util_unittests to the GN windows build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wintests3
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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"
32 #include "chrome/installer/util/master_preferences.h" 31 #include "chrome/installer/util/master_preferences.h"
33 #include "chrome/installer/util/product_unittest.h" 32 #include "chrome/installer/util/product_unittest.h"
34 #include "chrome/installer/util/util_constants.h" 33 #include "chrome/installer/util/util_constants.h"
35 #include "chrome/installer/util/work_item.h" 34 #include "chrome/installer/util/work_item.h"
36 #include "testing/gtest/include/gtest/gtest.h" 35 #include "testing/gtest/include/gtest/gtest.h"
37 36
37 #include "installer_util_strings.h" // NOLINT
38
38 using base::win::RegKey; 39 using base::win::RegKey;
39 using installer::InstallationState; 40 using installer::InstallationState;
40 using installer::InstallerState; 41 using installer::InstallerState;
41 using installer::MasterPreferences; 42 using installer::MasterPreferences;
42 using registry_util::RegistryOverrideManager; 43 using registry_util::RegistryOverrideManager;
43 44
44 class InstallerStateTest : public TestWithTempDirAndDeleteTempOverrideKeys { 45 class InstallerStateTest : public TestWithTempDirAndDeleteTempOverrideKeys {
45 protected: 46 protected:
46 }; 47 };
47 48
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
816 // Critical update newer than the new version. 817 // Critical update newer than the new version.
817 EXPECT_FALSE( 818 EXPECT_FALSE(
818 installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid()); 819 installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid());
819 EXPECT_FALSE( 820 EXPECT_FALSE(
820 installer_state.DetermineCriticalVersion(opv_version_, *pv_version_) 821 installer_state.DetermineCriticalVersion(opv_version_, *pv_version_)
821 .IsValid()); 822 .IsValid());
822 EXPECT_FALSE( 823 EXPECT_FALSE(
823 installer_state.DetermineCriticalVersion(pv_version_, *pv_version_) 824 installer_state.DetermineCriticalVersion(pv_version_, *pv_version_)
824 .IsValid()); 825 .IsValid());
825 } 826 }
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_sxs_distribution.cc ('k') | chrome/installer/util/installer_util_unittests.rc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698