Fill some gaps.

Tests for ExternalTabProxy.
Review URL: http://codereview.chromium.org/3888005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63262 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 10 deletions

diff --git a/chrome_frame/cfproxy_proxy.cc b/chrome_frame/cfproxy_proxy.cc
index 5a826c7..e03cb0e 100644
--- a/chrome_frame/cfproxy_proxy.cc
+++ b/chrome_frame/cfproxy_proxy.cc
@@ -30,30 +30,32 @@ void CFProxy::Init(const ProxyParams& params) {
       &CFProxy::InitInIoThread, params));
 }
 
-int CFProxy::AddDelegate(ChromeProxyDelegate* proxy) {
+int CFProxy::AddDelegate(ChromeProxyDelegate* delegate) {
   ipc_thread_.message_loop()->PostTask(FROM_HERE, NewRunnableMethod(this,
-      &CFProxy::AddDelegateOnIoThread, proxy));
+      &CFProxy::AddDelegateOnIoThread, delegate));
   return ++delegate_count_;
 }
 
-int CFProxy::RemoveDelegate(ChromeProxyDelegate* proxy) {
+int CFProxy::RemoveDelegate(ChromeProxyDelegate* delegate) {
   ipc_thread_.message_loop()->PostTask(FROM_HERE, NewRunnableMethod(this,
-      &CFProxy::RemoveDelegateOnIoThread, proxy));
+      &CFProxy::RemoveDelegateOnIoThread, delegate));
   return --delegate_count_;
 }
 
-void CFProxy::AddDelegateOnIoThread(ChromeProxyDelegate* proxy) {
+void CFProxy::AddDelegateOnIoThread(ChromeProxyDelegate* delegate) {
   DCHECK(CalledOnIpcThread());
-  DelegateHolder::AddDelegate(proxy);
+  DelegateHolder::AddDelegate(delegate);
   if (is_connected_) {
-    proxy->Connected(this);
+    delegate->Connected(this);
   }
 }
 
-void CFProxy::RemoveDelegateOnIoThread(ChromeProxyDelegate* proxy) {
+void CFProxy::RemoveDelegateOnIoThread(ChromeProxyDelegate* delegate) {
   DCHECK(CalledOnIpcThread());
-  DelegateHolder::RemoveDelegate(proxy);
-  proxy->Disconnected();
+  // Cancel any calls in progress.
+  sync_dispatcher_.Cancel(delegate);
+  DelegateHolder::RemoveDelegate(delegate);
+  delegate->Disconnected();
 }
 
 void CFProxy::InitInIoThread(const ProxyParams& params) {