diff options
| author | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 20:57:07 +0000 |
|---|---|---|
| committer | tommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-31 20:57:07 +0000 |
| commit | 701142a4edf3872fc9b433b68bdaf2c0a3c22db8 (patch) | |
| tree | a95befd802e323a1248a330595971a8a93653efd /chrome_frame/chrome_frame_automation.cc | |
| parent | ce5c3a8d14e6a4422eff08637e8f313491468e3e (diff) | |
| download | chromium_src-701142a4edf3872fc9b433b68bdaf2c0a3c22db8.zip chromium_src-701142a4edf3872fc9b433b68bdaf2c0a3c22db8.tar.gz chromium_src-701142a4edf3872fc9b433b68bdaf2c0a3c22db8.tar.bz2 | |
Silencing a couple of dchecks that occur when running the debug version of the *TabCrashReload* tests.
TEST=Run debug versions of *TabCrashReload* tests. There should be no more dchecks.
BUG=none
Review URL: http://codereview.chromium.org/3241008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 32fc24d..6f31bf7 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -613,7 +613,12 @@ bool ChromeFrameAutomationClient::Initialize( // InitializeComplete is called successfully. init_state_ = INITIALIZING; - HRESULT hr = security_manager_.CreateInstance(CLSID_InternetSecurityManager); + HRESULT hr = S_OK; + // If chrome crashed and is being restarted, the security_manager_ object + // might already be valid. + if (security_manager_.get() == NULL) + hr = security_manager_.CreateInstance(CLSID_InternetSecurityManager); + if (FAILED(hr)) { NOTREACHED() << __FUNCTION__ << " Failed to create InternetSecurityManager. Error: 0x%x" |