summaryrefslogtreecommitdiffstats
path: root/ceee/ie/plugin/bho/browser_helper_object.cc
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 22:08:45 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 22:08:45 +0000
commit731de025a4532107ff9f56a5320f30ec82b2bdea (patch)
tree24b5c73f52e9c65cac4a8bb3407545f28e74136b /ceee/ie/plugin/bho/browser_helper_object.cc
parent8c13ecad3069def849c686e5625234b637f206aa (diff)
downloadchromium_src-731de025a4532107ff9f56a5320f30ec82b2bdea.zip
chromium_src-731de025a4532107ff9f56a5320f30ec82b2bdea.tar.gz
chromium_src-731de025a4532107ff9f56a5320f30ec82b2bdea.tar.bz2
Fixed unittests broken by misplaced BrokerRpcClient::Connect call.
BUG=none TEST=none Review URL: http://codereview.chromium.org/5691001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee/ie/plugin/bho/browser_helper_object.cc')
-rw-r--r--ceee/ie/plugin/bho/browser_helper_object.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ceee/ie/plugin/bho/browser_helper_object.cc b/ceee/ie/plugin/bho/browser_helper_object.cc
index 8f5bc41..9d0e5a0a5 100644
--- a/ceee/ie/plugin/bho/browser_helper_object.cc
+++ b/ceee/ie/plugin/bho/browser_helper_object.cc
@@ -119,11 +119,8 @@ HRESULT BrowserHelperObject::FinalConstruct() {
LOG(INFO) <<
"Refused to instantiate the BHO when the visual component is hidden.";
return E_FAIL;
- } else {
- // Only the first call to this function really does anything.
- CookieAccountant::GetInstance()->PatchWininetFunctions();
- return S_OK;
}
+ return S_OK;
}
void BrowserHelperObject::FinalRelease() {
@@ -392,6 +389,9 @@ HRESULT BrowserHelperObject::Initialize(IUnknown* site) {
return hr;
}
+ // Do before HttpNegotiatePatch::Initialize.
+ CookieAccountant::GetInstance()->Initialize();
+
// Patch IHttpNegotiate for user-agent and cookie functionality.
HttpNegotiatePatch::Initialize();