summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-02 22:56:54 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-02 22:56:54 +0000
commit7e7b94a4086babab96393c6e2b774cf23bc6def0 (patch)
tree1e0bf9bf479ef03786598ea119e84f3f087d4c2e /chrome
parent65419994b88d290748fb75ea58ec3cee57e50a5f (diff)
downloadchromium_src-7e7b94a4086babab96393c6e2b774cf23bc6def0.zip
chromium_src-7e7b94a4086babab96393c6e2b774cf23bc6def0.tar.gz
chromium_src-7e7b94a4086babab96393c6e2b774cf23bc6def0.tar.bz2
Properly initialize the native wrapper to NULL to avoid a crash. Also re-enables tests I disabled last night when trying to find this.
http://crbug.com/13200 TEST=Start chrome with --first-run. Review URL: http://codereview.chromium.org/118136 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/mini_installer_test/test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/mini_installer_test/test.cc b/chrome/test/mini_installer_test/test.cc
index fd14e88d0..17ebf08 100644
--- a/chrome/test/mini_installer_test/test.cc
+++ b/chrome/test/mini_installer_test/test.cc
@@ -100,7 +100,7 @@ TEST_F(MiniInstallTest, DISABLED_MiniInstallerOverChromeMetaInstallerTest) {
installer.OverInstall();
}
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerSystemInstallTest) {
if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
ChromeMiniInstaller installer(mini_installer_constants::kSystemInstall,
mini_installer_constants::kDevChannelBuild);
@@ -108,7 +108,7 @@ TEST_F(MiniInstallTest, DISABLED_MiniInstallerSystemInstallTest) {
}
}
-TEST_F(MiniInstallTest, DISABLED_MiniInstallerUserInstallTest) {
+TEST_F(MiniInstallTest, MiniInstallerUserInstallTest) {
if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) {
ChromeMiniInstaller installer(mini_installer_constants::kUserInstall,
mini_installer_constants::kDevChannelBuild);