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

chrome/test/pyautolib/pyautolib.i

 // 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.
 //
 // Swig Interface for PyAuto.
 // PyAuto makes the Automation Proxy interface available in Python
 //
 // Running swig as:
 //   swig -python -c++ chrome/test/pyautolib/pyautolib.i
 // would generate pyautolib.py, pyautolib_wrap.cxx
 
 // When adding a new class or method, make sure you specify the doc string using
 // %feature("docstring", "doc string goes here") NODENAME;
 // and attach it to your node (class or method). This doc string will be
 // copied over in the generated python classes/methods.
 
 %module(docstring="Python interface to Automtion Proxy.") pyautolib
 %feature("autodoc", "1");
 
 %include <std_wstring.i>
 %include <std_string.i>
 
 %include "chrome/test/pyautolib/argc_argv.i"
 
 // NOTE: All files included in this file should also be listed under
 //       pyautolib_sources in chrome_tests.gypi.
 
 // Headers that can be swigged directly.
 %include "chrome/app/chrome_dll_resource.h"
-%include "chrome/common/automation_constants.h"
 %include "chrome/common/pref_names.h"
+%include "chrome/test/automation/automation_constants.h"
 
 %{
-#include "chrome/common/automation_constants.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/pyautolib/pyautolib.h"
 %}
 
 // Handle type uint32 conversions as int
 %apply int { uint32 };
 
 // scoped_refptr
 template <class T>
@@ skipping 326 matching lines @@
                            int window_index=0,
                            int tab_index=0,
                            const std::wstring& frame_xpath="");
 
   %feature("docstring", "Resets to the default theme. "
            "Returns true on success.") ResetToDefaultTheme;
   bool ResetToDefaultTheme();
 
 };