diff options
| author | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-29 20:18:50 +0000 |
|---|---|---|
| committer | hansl@google.com <hansl@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-29 20:18:50 +0000 |
| commit | a2595c29b1a8aa2fe1a76b0a130cc45cb58612c9 (patch) | |
| tree | 52ce2324609d70ec554ce99561be23492f589648 /ceee | |
| parent | c7698b2f0a2b03b7808ea67472a9621fb019be18 (diff) | |
| download | chromium_src-a2595c29b1a8aa2fe1a76b0a130cc45cb58612c9.zip chromium_src-a2595c29b1a8aa2fe1a76b0a130cc45cb58612c9.tar.gz chromium_src-a2595c29b1a8aa2fe1a76b0a130cc45cb58612c9.tar.bz2 | |
Remove an unnecessary DCHECK. IEIsProtectedModeProcess can fail if the call is invalid, in which case we don't want to assert.
BUG=64645
TEST=None
Review URL: http://codereview.chromium.org/5342007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67580 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee')
| -rw-r--r-- | ceee/ie/plugin/bho/cookie_accountant.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ceee/ie/plugin/bho/cookie_accountant.cc b/ceee/ie/plugin/bho/cookie_accountant.cc index b0c92a2..cf2d780 100644 --- a/ceee/ie/plugin/bho/cookie_accountant.cc +++ b/ceee/ie/plugin/bho/cookie_accountant.cc @@ -192,9 +192,11 @@ void CookieAccountant::SetScriptCookieStoreId(cookie_api::CookieInfo* cookie) { // If this is a Protected Mode process, the cookie store ID is different. bool is_protected_mode = false; HRESULT hr = ie_util::GetIEIsInProtectedMode(&is_protected_mode); - DCHECK(SUCCEEDED(hr)) << "Unexpected failure while checking the " << - "protected mode setting for IE tab process " << process_id << ". " << - com::LogHr(hr); + // E_NOTIMPL might occur when IE protected mode is disabled, or for IE6 or + // Windows XP. Those are not errors, so we shouldn't assert here. + DCHECK(SUCCEEDED(hr) || hr == E_NOTIMPL) << "Unexpected failure while " << + "checking the protected mode setting for IE tab process " << process_id << + ". " << com::LogHr(hr); if (SUCCEEDED(hr) && is_protected_mode) { store_id_stream << cookie_api::kProtectedModeStoreIdSuffix; } |