diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 08:58:19 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-04 08:58:19 +0000 |
| commit | 7d5c3acd124fae8816416374f629752138ec08e1 (patch) | |
| tree | e7c0eb48729c056ed4bbafbd3816fafd269a8f15 /chrome/test/automation/automation_messages.h | |
| parent | 13a9e86809ec0b88304afe5d2126d24b6750a327 (diff) | |
| download | chromium_src-7d5c3acd124fae8816416374f629752138ec08e1.zip chromium_src-7d5c3acd124fae8816416374f629752138ec08e1.tar.gz chromium_src-7d5c3acd124fae8816416374f629752138ec08e1.tar.bz2 | |
Revert my change to get the tree green. Not sure why the tests became flaky. I'll try to check them in again but in smaller chunks tomorrow.
TBR=mpcomplete
Review URL: http://codereview.chromium.org/21039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/automation_messages.h')
| -rw-r--r-- | chrome/test/automation/automation_messages.h | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h index d4e916c..e1fdf80 100644 --- a/chrome/test/automation/automation_messages.h +++ b/chrome/test/automation/automation_messages.h @@ -8,6 +8,7 @@ #include <string> #include "base/basictypes.h" +#include "chrome/common/ipc_message.h" #include "chrome/common/ipc_message_utils.h" enum AutomationMsg_NavigationResponseValues { @@ -16,9 +17,25 @@ enum AutomationMsg_NavigationResponseValues { AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED, }; -#define MESSAGES_INTERNAL_FILE \ - "chrome/test/automation/automation_messages_internal.h" -#include "chrome/common/ipc_message_macros.h" +// Two-pass include of render_messages_internal. Preprocessor magic allows +// us to use 1 header to define the enums and classes for our render messages. +#define IPC_MESSAGE_MACROS_ENUMS +#include "chrome/test/automation/automation_messages_internal.h" + +#ifdef IPC_MESSAGE_MACROS_LOG_ENABLED +# undef IPC_MESSAGE_MACROS_LOG +# define IPC_MESSAGE_MACROS_CLASSES +#include "chrome/test/automation/automation_messages_internal.h" + +# undef IPC_MESSAGE_MACROS_CLASSES +# define IPC_MESSAGE_MACROS_LOG +#include "chrome/test/automation/automation_messages_internal.h" +#else +// No debug strings requested, just define the classes +# define IPC_MESSAGE_MACROS_CLASSES +#include "chrome/test/automation/automation_messages_internal.h" +#endif + #endif // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__ |