OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 #include "chrome/installer/util/install_util.h" | 9 #include "chrome/installer/util/install_util.h" |
10 #include "chrome/installer/util/util_constants.h" | 10 #include "chrome/installer/util/util_constants.h" |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 chrome_sys_installer_->InstallChromeAndChromeFrame(true); | 161 chrome_sys_installer_->InstallChromeAndChromeFrame(true); |
162 } | 162 } |
163 | 163 |
164 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallUser) { | 164 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallUser) { |
165 cf_user_installer_->InstallChromeFrameUsingMultiInstall(); | 165 cf_user_installer_->InstallChromeFrameUsingMultiInstall(); |
166 } | 166 } |
167 | 167 |
168 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallSys) { | 168 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallSys) { |
169 cf_sys_installer_->InstallChromeFrameUsingMultiInstall(); | 169 cf_sys_installer_->InstallChromeFrameUsingMultiInstall(); |
170 } | 170 } |
| 171 |
| 172 TEST_F(MiniInstallTest, InstallChromeWithExistingChromeFrameUser) { |
| 173 cf_user_installer_->InstallChromeFrameUsingMultiInstall(); |
| 174 chrome_user_installer_->InstallChromeUsingMultiInstall(); |
| 175 } |
| 176 |
| 177 TEST_F(MiniInstallTest, InstallChromeWithExistingChromeFrameSys) { |
| 178 cf_sys_installer_->InstallChromeFrameUsingMultiInstall(); |
| 179 chrome_sys_installer_->InstallChromeUsingMultiInstall(); |
| 180 } |
171 #endif | 181 #endif |
172 | 182 |
173 TEST_F(MiniInstallTest, InstallMiniInstallerSys) { | 183 TEST_F(MiniInstallTest, InstallMiniInstallerSys) { |
174 chrome_user_installer_->Install(); | 184 chrome_user_installer_->Install(); |
175 } | 185 } |
176 | 186 |
177 #if defined(OS_WIN) | 187 #if defined(OS_WIN) |
178 // http://crbug.com/57157 - Fails on windows. | 188 // http://crbug.com/57157 - Fails on windows. |
179 #define MAYBE_InstallMiniInstallerUser FLAKY_InstallMiniInstallerUser | 189 #define MAYBE_InstallMiniInstallerUser FLAKY_InstallMiniInstallerUser |
180 #else | 190 #else |
181 #define MAYBE_InstallMiniInstallerUser InstallMiniInstallerUser | 191 #define MAYBE_InstallMiniInstallerUser InstallMiniInstallerUser |
182 #endif | 192 #endif |
183 TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) { | 193 TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) { |
184 chrome_user_installer_->Install(); | 194 chrome_user_installer_->Install(); |
185 } | 195 } |
186 | 196 |
187 TEST(GenericInstallTest, MiniInstallTestValidWindowsVersion) { | 197 TEST(GenericInstallTest, MiniInstallTestValidWindowsVersion) { |
188 // We run the tests on all supported OSes. | 198 // We run the tests on all supported OSes. |
189 // Make sure the code agrees. | 199 // Make sure the code agrees. |
190 EXPECT_TRUE(InstallUtil::IsOSSupported()); | 200 EXPECT_TRUE(InstallUtil::IsOSSupported()); |
191 } | 201 } |
OLD | NEW |