Adding policy support to Chrome Frame's launcher so that additional parameters can be passed to Chr…

chrome_frame/chrome_frame_automation.cc

 // Copyright (c) 2012 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.
 
 #include "chrome_frame/chrome_frame_automation.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 501 matching lines @@
         base::Bind(&AutomationProxyCacheEntry::RemoveDelegate,
                    base::Unretained(entry), delegate, &done, &last_delegate));
     done.Wait();
   }
 
   if (last_delegate) {
     lock_.Acquire();
     Vector::ContainerType::iterator it = std::find(proxies_.container().begin(),
                                                    proxies_.container().end(),
                                                    entry);
-    proxies_.container().erase(it);
+    DLOG_IF(ERROR, it == proxies_.container().end())

[grt (UTC plus 2), 2012/03/23 15:49:12]

nit: make this DLOG(ERROR) and move it into an else clause below the call to
erase()

[tommi (sloooow) - chröme, 2012/03/26 11:24:37]

Done.

+        << "Proxy wasn't found. Proxy map is likely empty (size="
+        << proxies_.container().size() << ").";
+    if (it != proxies_.container().end())
+      proxies_.container().erase(it);
+
     lock_.Release();
   }
 
   entry->Release();
 
   return true;
 }
 
 static base::LazyInstance<ProxyFactory>::Leaky
     g_proxy_factory = LAZY_INSTANCE_INITIALIZER;
@@ skipping 791 matching lines @@
     const net::URLRequestStatus& status) {
   automation_server_->Send(new AutomationMsg_RequestEnd(
       tab_->handle(), request_id, status));
 }
 
 void ChromeFrameAutomationClient::OnCookiesRetrieved(bool success,
     const GURL& url, const std::string& cookie_string, int cookie_id) {
   automation_server_->Send(new AutomationMsg_GetCookiesHostResponse(
       tab_->handle(), success, url, cookie_string, cookie_id));
 }