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

Side by Side Diff: chrome/test/mini_installer_test/test.cc

Issue 118136: Properly initialize the native wrapper to NULL to avoid a crash. Also re-enab... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | views/controls/separator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 #include "base/platform_thread.h" 4 #include "base/platform_thread.h"
5 #include "base/win_util.h" 5 #include "base/win_util.h"
6 #include "chrome/installer/util/install_util.h" 6 #include "chrome/installer/util/install_util.h"
7 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h" 7 #include "chrome/test/mini_installer_test/mini_installer_test_constants.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 9
10 #include "chrome_mini_installer.h" 10 #include "chrome_mini_installer.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 installer.InstallStandaloneInstaller(); 93 installer.InstallStandaloneInstaller();
94 } 94 }
95 95
96 // This test doesn't make sense. Disabling for now. 96 // This test doesn't make sense. Disabling for now.
97 TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeMetaInstallerTest) { 97 TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeMetaInstallerTest) {
98 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 98 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
99 mini_installer_constants::kDevChannelBuild); 99 mini_installer_constants::kDevChannelBuild);
100 installer.OverInstall(); 100 installer.OverInstall();
101 } 101 }
102 102
103 TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) { 103 TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
104 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { 104 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
105 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall, 105 ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall,
106 mini_installer_constants::kDevChannelBuild); 106 mini_installer_constants::kDevChannelBuild);
107 installer.Install(); 107 installer.Install();
108 } 108 }
109 } 109 }
110 110
111 TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) { 111 TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
112 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { 112 if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
113 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 113 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
114 mini_installer_constants::kDevChannelBuild); 114 mini_installer_constants::kDevChannelBuild);
115 installer.Install(); 115 installer.Install();
116 } 116 }
117 } 117 }
118 118
119 TEST_F(MiniInstallTest, StableChromeInstallerOverChromeMetaInstallerTest) { 119 TEST_F(MiniInstallTest, StableChromeInstallerOverChromeMetaInstallerTest) {
120 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 120 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
121 mini_installer_constants::kStableChannelBuild); 121 mini_installer_constants::kStableChannelBuild);
122 installer.OverInstall(); 122 installer.OverInstall();
123 } 123 }
124 124
125 TEST_F(MiniInstallTest, DevChromeInstallerOverChromeMetaInstallerTest) { 125 TEST_F(MiniInstallTest, DevChromeInstallerOverChromeMetaInstallerTest) {
126 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall, 126 ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
127 mini_installer_constants::kDevChannelBuild); 127 mini_installer_constants::kDevChannelBuild);
128 installer.OverInstall(); 128 installer.OverInstall();
129 } 129 }
130 130
131 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) { 131 TEST(InstallUtilTests, MiniInstallTestValidWindowsVersion) {
132 // We run the tests on all supported OSes. 132 // We run the tests on all supported OSes.
133 // Make sure the code agrees. 133 // Make sure the code agrees.
134 EXPECT_TRUE(InstallUtil::IsOSSupported()); 134 EXPECT_TRUE(InstallUtil::IsOSSupported());
135 } 135 }
OLDNEW
« no previous file with comments | « no previous file | views/controls/separator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698