Revert 70144 and 70145 and add a build fix.

chrome_frame/chrome_frame_automation.cc

 // 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.
 
 #include "chrome_frame/chrome_frame_automation.h"
 
 #include "app/app_switches.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 55 matching lines @@
   virtual bool OnMessageReceived(const IPC::Message& message) {
     if (message.is_reply())
       return false;
 
     if (!ChromeFrameDelegateImpl::IsTabMessage(message))
       return false;
 
     // Get AddRef-ed pointer to corresponding TabProxy object
     TabProxy* tab = static_cast<TabProxy*>(tracker_->GetResource(
         message.routing_id()));
+    bool handled = false;
     if (tab) {
       tab->OnMessageReceived(message);
-      tab->Release();
+      handled = tab->Release();
     } else {
       DLOG(ERROR) << "Failed to find TabProxy for tab:" << message.routing_id();
     }
-    return true;
+    return handled;
   }
 
   virtual void OnChannelError() {
     std::list<AutomationHandle>::const_iterator iter = tabs_list_.begin();
     for (; iter != tabs_list_.end(); ++iter) {
       // Get AddRef-ed pointer to corresponding TabProxy object
       TabProxy* tab = static_cast<TabProxy*>(tracker_->GetResource(*iter));
       if (tab) {
         tab->OnChannelError();
         tab->Release();
@@ skipping 1068 matching lines @@
   PostTask(FROM_HERE, NewRunnableMethod(this,
       &ChromeFrameAutomationClient::ProcessUrlRequestMessage, tab, msg, true));
   return true;
 }
 
 // These are invoked in channel's background thread.
 // Cannot call any method of the activex/npapi here since they are STA
 // kind of beings.
 // By default we marshal the IPC message to the main/GUI thread and from there
 // we safely invoke chrome_frame_delegate_->OnMessageReceived(msg).
-void ChromeFrameAutomationClient::OnMessageReceived(TabProxy* tab,
+bool ChromeFrameAutomationClient::OnMessageReceived(TabProxy* tab,
                                                     const IPC::Message& msg) {
   DCHECK(tab == tab_.get());
   // Quickly process network related messages.
   if (url_fetcher_ && ProcessUrlRequestMessage(tab, msg, false))
-    return;
+    return true;
 
   // Early check to avoid needless marshaling
   if (chrome_frame_delegate_ == NULL)
-    return;
+    return false;
 
   PostTask(FROM_HERE, NewRunnableMethod(this,
       &ChromeFrameAutomationClient::OnMessageReceivedUIThread, msg));
+  return true;
 }
 
 void ChromeFrameAutomationClient::OnChannelError(TabProxy* tab) {
   DCHECK(tab == tab_.get());
   // Early check to avoid needless marshaling
   if (chrome_frame_delegate_ == NULL)
     return;
 
   PostTask(FROM_HERE, NewRunnableMethod(this,
       &ChromeFrameAutomationClient::OnChannelErrorUIThread));
@@ skipping 261 matching lines @@
     const 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));
 }