diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 14:23:55 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 14:23:55 +0000 |
| commit | f5eea8a95edf3259fba6c0c935c0ffdacd8bce3c (patch) | |
| tree | 79cb9a2efb52fc6782eb924289cee3cfb3a3d335 /sync/engine | |
| parent | 11e67078de51c16ad55d75e4b884ff5f2019cfde (diff) | |
| download | chromium_src-f5eea8a95edf3259fba6c0c935c0ffdacd8bce3c.zip chromium_src-f5eea8a95edf3259fba6c0c935c0ffdacd8bce3c.tar.gz chromium_src-f5eea8a95edf3259fba6c0c935c0ffdacd8bce3c.tar.bz2 | |
[Sync] Re-enable experiments datatype
It was disabled while a server bug was fixed. The fix has now rolled out.
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11412057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/engine')
| -rw-r--r-- | sync/engine/apply_control_data_updates_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/engine/apply_control_data_updates_unittest.cc b/sync/engine/apply_control_data_updates_unittest.cc index c778c45..09c5e11 100644 --- a/sync/engine/apply_control_data_updates_unittest.cc +++ b/sync/engine/apply_control_data_updates_unittest.cc @@ -871,7 +871,7 @@ TEST_F(ApplyControlDataUpdatesTest, } // Check that we can apply a simple control datatype node successfully. -TEST_F(ApplyControlDataUpdatesTest, DISABLED_ControlApply) { +TEST_F(ApplyControlDataUpdatesTest, ControlApply) { EXPECT_FALSE(directory()->initial_sync_ended_types().Has(EXPERIMENTS)); std::string experiment_id = "experiment"; @@ -890,7 +890,7 @@ TEST_F(ApplyControlDataUpdatesTest, DISABLED_ControlApply) { } // Verify that we apply top level folders before their children. -TEST_F(ApplyControlDataUpdatesTest, DISABLED_ControlApplyParentBeforeChild) { +TEST_F(ApplyControlDataUpdatesTest, ControlApplyParentBeforeChild) { EXPECT_FALSE(directory()->initial_sync_ended_types().Has(EXPERIMENTS)); std::string parent_id = "parent"; @@ -914,7 +914,7 @@ TEST_F(ApplyControlDataUpdatesTest, DISABLED_ControlApplyParentBeforeChild) { // Verify that we handle control datatype conflicts by preserving the server // data. -TEST_F(ApplyControlDataUpdatesTest, DISABLED_ControlConflict) { +TEST_F(ApplyControlDataUpdatesTest, ControlConflict) { EXPECT_FALSE(directory()->initial_sync_ended_types().Has(EXPERIMENTS)); std::string experiment_id = "experiment"; |