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

chrome/test/automation/automation_proxy.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_TEST_AUTOMATION_AUTOMATION_PROXY_H__
 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "app/message_box_flags.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/process_util.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/browser.h"
-#include "chrome/common/automation_constants.h"
+#include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "gfx/native_widget_types.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sync_channel.h"
 
 class BrowserProxy;
 class ExtensionProxy;
@@ skipping 267 matching lines @@
 
   // Delay to let the browser execute the command.
   base::TimeDelta command_execution_timeout_;
 
   PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__