| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 } | 157 } |
| 158 | 158 |
| 159 TEST_F(MiniInstallTest, | 159 TEST_F(MiniInstallTest, |
| 160 InstallChromeAndChromeFrameReadyModeSys) { | 160 InstallChromeAndChromeFrameReadyModeSys) { |
| 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 |
| 168 TEST_F(MiniInstallTest, InstallChromeFrameUsingMultiInstallSys) { |
| 169 cf_sys_installer_->InstallChromeFrameUsingMultiInstall(); |
| 170 } |
| 167 #endif | 171 #endif |
| 168 | 172 |
| 169 TEST_F(MiniInstallTest, InstallMiniInstallerSys) { | 173 TEST_F(MiniInstallTest, InstallMiniInstallerSys) { |
| 170 chrome_user_installer_->Install(); | 174 chrome_user_installer_->Install(); |
| 171 } | 175 } |
| 172 | 176 |
| 173 #if defined(OS_WIN) | 177 #if defined(OS_WIN) |
| 174 // http://crbug.com/57157 - Fails on windows. | 178 // http://crbug.com/57157 - Fails on windows. |
| 175 #define MAYBE_InstallMiniInstallerUser FLAKY_InstallMiniInstallerUser | 179 #define MAYBE_InstallMiniInstallerUser FLAKY_InstallMiniInstallerUser |
| 176 #else | 180 #else |
| 177 #define MAYBE_InstallMiniInstallerUser InstallMiniInstallerUser | 181 #define MAYBE_InstallMiniInstallerUser InstallMiniInstallerUser |
| 178 #endif | 182 #endif |
| 179 TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) { | 183 TEST_F(MiniInstallTest, MAYBE_InstallMiniInstallerUser) { |
| 180 chrome_user_installer_->Install(); | 184 chrome_user_installer_->Install(); |
| 181 } | 185 } |
| 182 | 186 |
| 183 TEST(GenericInstallTest, MiniInstallTestValidWindowsVersion) { | 187 TEST(GenericInstallTest, MiniInstallTestValidWindowsVersion) { |
| 184 // We run the tests on all supported OSes. | 188 // We run the tests on all supported OSes. |
| 185 // Make sure the code agrees. | 189 // Make sure the code agrees. |
| 186 EXPECT_TRUE(InstallUtil::IsOSSupported()); | 190 EXPECT_TRUE(InstallUtil::IsOSSupported()); |
| 187 } | 191 } |
| OLD | NEW |