summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 17:51:22 +0000
committerrobertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-01 17:51:22 +0000
commite41a8af4a5cd39c445ebde30e904ea4452bc722e (patch)
treec0f357bcc70a599d37efe67477289ef8c02efb7f /chrome_frame
parentc53a572a0f1669102bb2e4794c61cf4761f9ca73 (diff)
downloadchromium_src-e41a8af4a5cd39c445ebde30e904ea4452bc722e.zip
chromium_src-e41a8af4a5cd39c445ebde30e904ea4452bc722e.tar.gz
chromium_src-e41a8af4a5cd39c445ebde30e904ea4452bc722e.tar.bz2
Don't crash if the CF Tests are not running as admin.
BUG=NONE TEST=NONE Review URL: http://codereview.chromium.org/9533009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124426 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test_utils.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index 8ea5f6e..2333cc6 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -123,10 +123,11 @@ void ScopedChromeFrameRegistrar::DoRegistration(
}
if (exit_code != 0) {
if (registration_operation == REGISTER) {
- LOG(FATAL)
+ LOG(ERROR)
<< "DLL registration failed (exit code: 0x" << std::hex << exit_code
<< ", command: " << registration_command
<< "). Make sure you are running as Admin.";
+ ::ExitProcess(1);
} else {
LOG(WARNING)
<< "DLL unregistration failed (exit code: 0x" << std::hex << exit_code