diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 23:39:42 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-30 23:39:42 +0000 |
| commit | 8444e019fc688cf93a7e2edb6e0d05ab89308482 (patch) | |
| tree | 27dbed281ae6e48685bd9f9381bc9c7cd08ffeaf /sync | |
| parent | 8f21b48d42cc191a643280d280430876dafaaf0e (diff) | |
| download | chromium_src-8444e019fc688cf93a7e2edb6e0d05ab89308482.zip chromium_src-8444e019fc688cf93a7e2edb6e0d05ab89308482.tar.gz chromium_src-8444e019fc688cf93a7e2edb6e0d05ab89308482.tar.bz2 | |
[Sync] Fix disabling of tests from 149074
TBR=sergeyu@chromium.org
BUG=139726
Review URL: https://chromiumcodereview.appspot.com/10837012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
| -rw-r--r-- | sync/internal_api/syncapi_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/internal_api/syncapi_unittest.cc b/sync/internal_api/syncapi_unittest.cc index 3c0a1d5..e43a2e2 100644 --- a/sync/internal_api/syncapi_unittest.cc +++ b/sync/internal_api/syncapi_unittest.cc @@ -2565,7 +2565,7 @@ class SyncManagerTestWithMockScheduler : public SyncManagerTest { #else #define MAYBE_BasicConfiguration BasicConfiguration #endif -TEST_F(SyncManagerTestWithMockScheduler, BasicConfiguration) { +TEST_F(SyncManagerTestWithMockScheduler, MAYBE_BasicConfiguration) { ConfigureReason reason = CONFIGURE_REASON_RECONFIGURATION; ModelTypeSet types_to_download(BOOKMARKS, PREFERENCES); ModelSafeRoutingInfo new_routing_info; @@ -2746,7 +2746,7 @@ TEST_F(SyncManagerTest, PurgePartiallySyncedTypes) { #else #define MAYBE_PurgeDisabledTypes PurgeDisabledTypes #endif -TEST_F(SyncManagerTest, PurgeDisabledTypes) { +TEST_F(SyncManagerTest, MAYBE_PurgeDisabledTypes) { ModelSafeRoutingInfo routing_info; GetModelSafeRoutingInfo(&routing_info); ModelTypeSet enabled_types = GetRoutingInfoTypes(routing_info); |