Revert 68293 - Revert 68290 - Restored missing BrokerRpcClient::Connect....

ceee/ie/plugin/bho/cookie_accountant.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Defines the CookieAccountant class, which is responsible for observing
 // and recording all cookie-related information generated by a particular
 // IE browser session. It records and fires cookie change events, it provides
 // access to session and persistent cookies.
 
 #ifndef CEEE_IE_PLUGIN_BHO_COOKIE_ACCOUNTANT_H_
@@ skipping 36 matching lines @@
       LPCWSTR lpszURL, LPCWSTR lpszCookieName, LPCWSTR lpszCookieData,
       DWORD dwFlags, DWORD_PTR dwReserved);
 
  protected:
   // Exposed to subclasses mainly for unit testing purposes; production code
   // should use the ProductionCookieAccountant class instead.
   // Since this class has one instance per window, not per tab, we cannot
   // queue the events sent to the broker. They don't need to be sent to the BHO
   // because they don't need tab_id anyway.
   CookieAccountant()
-      : cookie_events_funnel_(new BrokerRpcClient(true)),
+      : broker_rpc_client_(true),
+        cookie_events_funnel_(&broker_rpc_client_),
         patching_wininet_functions_(false) {
+    HRESULT hr = broker_rpc_client_.Connect(true);
+    DCHECK(SUCCEEDED(hr));
   }
 
   virtual ~CookieAccountant();
 
   // Records the modification or creation of a cookie. Fires off a
   // cookies.onChanged event to Chrome Frame.
   virtual void RecordCookie(
       const std::string& url, const std::string& cookie_data,
       const base::Time& current_time);
 
@@ skipping 34 matching lines @@
 
   // Sets the cookie expiration date for a script cookie event.
   void SetScriptCookieExpirationDate(
       const net::CookieMonster::ParsedCookie& parsed_cookie,
       const base::Time& current_time,
       cookie_api::CookieInfo* cookie);
 
   // Sets the cookie store ID for a script cookie event.
   void SetScriptCookieStoreId(cookie_api::CookieInfo* cookie);
 
+  // Broker RPC client.
+  BrokerRpcClient broker_rpc_client_;
+
   // The funnel for sending cookie events to the broker.
   CookieEventsFunnel cookie_events_funnel_;
 
   DISALLOW_COPY_AND_ASSIGN(CookieAccountant);
 };
 
 // A singleton that initializes and keeps the CookieAccountant used by
 // production code. This class is separate so that CookieAccountant can still
 // be accessed for unit testing.
 class ProductionCookieAccountant : public CookieAccountant,
     public Singleton<ProductionCookieAccountant> {
  private:
   // This ensures no construction is possible outside of the class itself.
   friend struct DefaultSingletonTraits<ProductionCookieAccountant>;
   DISALLOW_IMPLICIT_CONSTRUCTORS(ProductionCookieAccountant);
 };
 
 #endif  // CEEE_IE_PLUGIN_BHO_COOKIE_ACCOUNTANT_H_