Revert 70144 and 70145 and add a build fix.

chrome_frame/chrome_frame_automation.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.
 
 #ifndef CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
 #define CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_
 
 #include <atlbase.h>
 #include <atlwin.h>
 #include <string>
@@ skipping 441 matching lines @@
     route_all_top_level_navigations_ = route_all_top_level_navigations;
   }
 
  protected:
   // ChromeFrameAutomationProxy::LaunchDelegate implementation.
   virtual void LaunchComplete(ChromeFrameAutomationProxy* proxy,
                               AutomationLaunchResult result);
   virtual void AutomationServerDied();
 
   // TabProxyDelegate implementation
-  virtual void OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
+  virtual bool OnMessageReceived(TabProxy* tab, const IPC::Message& msg);
   virtual void OnChannelError(TabProxy* tab);
 
   void CreateExternalTab();
   AutomationLaunchResult CreateExternalTabComplete(HWND chrome_window,
                                                    HWND tab_window,
                                                    int tab_handle,
                                                    int session_id);
   // Called in UI thread. Here we fire event to the client notifying for
   // the result of Initialize() method call.
   void InitializeComplete(AutomationLaunchResult result);
@@ skipping 86 matching lines @@
   // set to true if the host needs to get notified of all top level navigations
   // in this page. This typically applies to hosts which would render the new
   // page without chrome frame. Defaults to false.
   bool route_all_top_level_navigations_;
 
   friend class BeginNavigateContext;
   friend class CreateExternalTabContext;
 };
 
 #endif  // CHROME_FRAME_CHROME_FRAME_AUTOMATION_H_