diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 23:27:31 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-03 23:27:31 +0000 |
| commit | 909a81eaa4568f4b13562dc3f34ac7268b590f09 (patch) | |
| tree | 958829ea557102634d623123a77f0ae20a7dd6da /third_party | |
| parent | c09fb1c79c0a3e76dbb6091e4b718fd9bb197395 (diff) | |
| download | chromium_src-909a81eaa4568f4b13562dc3f34ac7268b590f09.zip chromium_src-909a81eaa4568f4b13562dc3f34ac7268b590f09.tar.gz chromium_src-909a81eaa4568f4b13562dc3f34ac7268b590f09.tar.bz2 | |
PyAuto hooks for Sync in TestingAutomationProvider
This patch exposes hooks for sync in TestingAutomationProvider that the chrome pyauto test suite can use. It contains the following changes:
- Partial revert of an earlier change to ProfileSyncServiceHarness. Some of its methods were made pure virtual, but this ended up being unnecessary. Also ripped out unnecessary code from LiveSyncTest.
- Minor refactor of ProfileSyncServiceHarness to allow for scenarios where the browser is restarted.
- A bunch of new methods in TestingAutomationProvider: SignInToSync, GetSyncInfo, AwaitSyncCycleCompletion, EnableSyncForDatatypes and DisableSyncForDatatypes.
- A new method in model_type.h/cc called ModelTypeFromString. Required for automation.
- New APIs in pyauto.py for sync.
- New test suite sync.py with sample tests.
BUG=53651, 60970, 56460, 61639
TEST=run pyauto sync tests
Review URL: http://codereview.chromium.org/4096004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/npapi/bindings/npapi.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index e4693f2..3d31eab 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h @@ -73,9 +73,13 @@ /* BEGIN GOOGLE MODIFICATIONS */ /* On Linux and Mac, be sure to set Mozilla-specific macros. */ #if defined(USE_X11) +#if !defined(XP_UNIX) #define XP_UNIX 1 +#endif +#if !defined(MOZ_X11) #define MOZ_X11 1 #endif +#endif /* END GOOGLE MODIFICATIONS */ #if defined(__SYMBIAN32__) |