Revert "Refactor automation messages." due to mysterious problems on mac.

chrome_frame/cfproxy_support.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/cfproxy_private.h"
 
 #include <vector>
 #include "base/atomic_sequence_num.h"
 #include "base/command_line.h"
 #include "base/process_util.h"
-#include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/test/automation/automation_messages.h"
 #include "chrome_frame/chrome_launcher_utils.h"
 #include "chrome_frame/utils.h"  // for IsHeadlessMode();
 
 
 namespace {
 void DispatchReplyFail(uint32 type,
                        ChromeProxyDelegate* delegate,
                        SyncMessageContext* ctx) {
   switch (type) {
     case AutomationMsg_CreateExternalTab::ID:
@@ skipping 503 matching lines @@
 
     case AutomationMsg_CloseExternalTab__ID: {
       // Tuple1<int>
       delegate->TabClosed();
       return true;
     }
   }
 
   return false;
 }